diff options
| author | Joel Stanley <joel@jms.id.au> | 2018-05-08 19:52:58 +0930 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2018-05-09 10:17:42 -0500 |
| commit | 5fc61b48680180a7a66d2ada4878b229825e8e51 (patch) | |
| tree | ba280e869a45d97d3c2afd111e18473b6d497a7e | |
| parent | 62348fd4990be8044383b05234e78ee7ac859ca1 (diff) | |
| download | skiboot-5fc61b48680180a7a66d2ada4878b229825e8e51.zip skiboot-5fc61b48680180a7a66d2ada4878b229825e8e51.tar.gz skiboot-5fc61b48680180a7a66d2ada4878b229825e8e51.tar.bz2 | |
opal-ci: 18.04: Go back to updating before installing packages
Docker tries to cache stuff and it bites us.
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
| -rw-r--r-- | opal-ci/Dockerfile-ubuntu-18.04 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/opal-ci/Dockerfile-ubuntu-18.04 b/opal-ci/Dockerfile-ubuntu-18.04 index e7ba238..4c272d3 100644 --- a/opal-ci/Dockerfile-ubuntu-18.04 +++ b/opal-ci/Dockerfile-ubuntu-18.04 @@ -1,8 +1,7 @@ FROM ubuntu:18.04 ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update -qq -RUN if [ `arch` != "ppc64le" ]; then apt-get install -y gcc-powerpc64le-linux-gnu; fi -RUN apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 gcc-arm-linux-gnueabi clang qemu-system-ppc +RUN if [ `arch` != "ppc64le" ]; then apt-get update -qq && apt-get install -y gcc-powerpc64le-linux-gnu; fi +RUN apt-get update -qq && apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 gcc-arm-linux-gnueabi clang qemu-system-ppc RUN if [ `arch` = "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb; dpkg -i systemsim-p8_1.0-2_amd64.deb; fi RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi COPY . /build/ |