Skip to content

Commit

Permalink
Revert "chore(deps): update docker dependencies"
Browse files Browse the repository at this point in the history
This reverts commit 5a5759b.

Signed-off-by: Yang Chiu <[email protected]>
  • Loading branch information
yangchiu authored and khushboo-rancher committed May 10, 2024
1 parent 5a5759b commit c611eb7
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
7 changes: 3 additions & 4 deletions e2e/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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 && \
Expand Down
7 changes: 3 additions & 4 deletions manager/integration/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion manager/integration/tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion mirror_csi_images/Dockerfile.setup
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

0 comments on commit c611eb7

Please sign in to comment.