From c611eb702343137261ca08fd8373cdeb60fa95ab Mon Sep 17 00:00:00 2001 From: Yang Chiu Date: Fri, 10 May 2024 08:40:01 +0800 Subject: [PATCH] Revert "chore(deps): update docker dependencies" This reverts commit 5a5759b5abf7263b47cd57930503b7efa613d159. Signed-off-by: Yang Chiu --- e2e/Dockerfile | 7 +++---- manager/integration/Dockerfile | 7 +++---- manager/integration/tests/requirements.txt | 2 +- mirror_csi_images/Dockerfile.setup | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/e2e/Dockerfile b/e2e/Dockerfile index 0baae892a0..1766faaa87 100644 --- a/e2e/Dockerfile +++ b/e2e/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.suse.com/bci/python:3.12 +FROM registry.suse.com/bci/python:3.11 ARG TARGETPLATFORM RUN if [ "$TARGETPLATFORM" != "linux/amd64" ] && [ "$TARGETPLATFORM" != "linux/arm64" ]; then \ @@ -10,9 +10,8 @@ ENV ARCH ${TARGETPLATFORM#linux/} ARG KUBECTL_VERSION=v1.17.0 ARG YQ_VERSION=v4.24.2 -RUN zypper addrepo https://download.opensuse.org/repositories/Java:/Factory/SLE_15_SP6/Java:Factory.repo -RUN zypper --gpg-auto-import-keys ref -f -RUN zypper in -y vim-small nfs-client xfsprogs e2fsprogs util-linux-systemd gcc python312-devel gawk java-11-openjdk tar awk gzip wget && \ +RUN zypper ref -f +RUN zypper in -y vim-small nfs-client xfsprogs e2fsprogs util-linux-systemd gcc python311-devel gawk java-11-openjdk tar awk gzip wget && \ rm -rf /var/cache/zypp/* RUN curl -sO https://storage.googleapis.com/kubernetes-release/release/$KUBECTL_VERSION/bin/linux/${ARCH}/kubectl && \ diff --git a/manager/integration/Dockerfile b/manager/integration/Dockerfile index 4ca1e71e7f..f4200c260f 100644 --- a/manager/integration/Dockerfile +++ b/manager/integration/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.suse.com/bci/python:3.12 +FROM registry.suse.com/bci/python:3.11 ARG TARGETPLATFORM RUN if [ "$TARGETPLATFORM" != "linux/amd64" ] && [ "$TARGETPLATFORM" != "linux/arm64" ]; then \ @@ -11,9 +11,8 @@ ARG KUBECTL_VERSION=v1.28.4 ARG YQ_VERSION=v4.24.2 ARG TERRAFORM_VERSION=1.3.5 -RUN zypper addrepo https://download.opensuse.org/repositories/Java:/Factory/SLE_15_SP6/Java:Factory.repo -RUN zypper --gpg-auto-import-keys ref -f -RUN zypper in -y vim-small nfs-client xfsprogs e2fsprogs util-linux-systemd gcc python312-devel gawk java-11-openjdk tar awk gzip wget unzip && \ +RUN zypper ref -f +RUN zypper in -y vim-small nfs-client xfsprogs e2fsprogs util-linux-systemd gcc python311-devel gawk java-11-openjdk tar awk gzip wget unzip && \ rm -rf /var/cache/zypp/* RUN curl -sO https://storage.googleapis.com/kubernetes-release/release/$KUBECTL_VERSION/bin/linux/${ARCH}/kubectl && \ diff --git a/manager/integration/tests/requirements.txt b/manager/integration/tests/requirements.txt index 130072cd39..b0bb8357b5 100644 --- a/manager/integration/tests/requirements.txt +++ b/manager/integration/tests/requirements.txt @@ -9,6 +9,6 @@ pytest-repeat==0.9.1 pytest-order==1.0.1 six==1.12.0 minio==5.0.10 -pyyaml==6.0.1 +pyyaml==6.0 pandas prometheus_client diff --git a/mirror_csi_images/Dockerfile.setup b/mirror_csi_images/Dockerfile.setup index 6de7792767..23aa8e287a 100644 --- a/mirror_csi_images/Dockerfile.setup +++ b/mirror_csi_images/Dockerfile.setup @@ -6,6 +6,6 @@ WORKDIR $WORKSPACE RUN apk add --no-cache skopeo docker jq bash grep -COPY --from=docker/buildx-bin:v0.14 /buildx /usr/libexec/docker/cli-plugins/docker-buildx +COPY --from=docker/buildx-bin:v0.13 /buildx /usr/libexec/docker/cli-plugins/docker-buildx COPY [".", "$WORKSPACE"]