about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2023-07-18 21:04:44 -0700
committerJosh Stone <jistone@redhat.com>2023-07-21 12:22:25 -0700
commit35b87d02068406d2fd34ef31adafd49b0f1f7552 (patch)
treeac05632717f8847c8263d802ebb046a914eacc0b
parentb160c8fe5c2cc5ee50798d07932f77070df4f585 (diff)
downloadrust-35b87d02068406d2fd34ef31adafd49b0f1f7552.tar.gz
rust-35b87d02068406d2fd34ef31adafd49b0f1f7552.zip
ci: Update dist-powerpc64le-linux to ubuntu:22.04
-rw-r--r--src/ci/docker/host-x86_64/dist-powerpc64le-linux/Dockerfile8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/ci/docker/host-x86_64/dist-powerpc64le-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-powerpc64le-linux/Dockerfile
index 2b2871c2ec0..5dc282403be 100644
--- a/src/ci/docker/host-x86_64/dist-powerpc64le-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-powerpc64le-linux/Dockerfile
@@ -1,22 +1,16 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 COPY scripts/cross-apt-packages.sh /scripts/
 RUN sh /scripts/cross-apt-packages.sh
 
 COPY scripts/rustbuild-setup.sh /scripts/
 RUN sh /scripts/rustbuild-setup.sh
-USER rustbuild
 WORKDIR /tmp
 
-USER root
-
 RUN apt-get install -y --no-install-recommends rpm2cpio cpio
 COPY host-x86_64/dist-powerpc64le-linux/shared.sh host-x86_64/dist-powerpc64le-linux/build-powerpc64le-toolchain.sh /tmp/
 RUN ./build-powerpc64le-toolchain.sh
 
-COPY scripts/cmake.sh /scripts/
-RUN /scripts/cmake.sh
-
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh