Skip to content

Commit

Permalink
Update base-20.dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
BorisKofman committed Jan 24, 2024
1 parent 52e4a45 commit 71d4ee2
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions images/base-20.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ FROM cypress/base:20.9.0

ARG TARGETOS
ARG TARGETARCH
ARG DOCKER_VERSION=24.0.7
ARG BUILDX_VERSION=0.12.0
# ARG DOCKER_VERSION=24.0.7
# ARG BUILDX_VERSION=0.12.0

# Install required packages
RUN apt-get update && \
Expand All @@ -17,17 +17,17 @@ RUN apt-get update && \
&& apt-get clean \
&& rm -rf /var/cache/apt/archives/*

RUN export RUNNER_ARCH=${TARGETARCH} \
&& if [ "$RUNNER_ARCH" = "amd64" ]; then export DOCKER_ARCH=x86_64 ; fi \
&& if [ "$RUNNER_ARCH" = "arm64" ]; then export DOCKER_ARCH=aarch64 ; fi \
&& curl -fLo docker.tgz https://download.docker.com/${TARGETOS}/static/stable/${DOCKER_ARCH}/docker-${DOCKER_VERSION}.tgz \
&& tar zxvf docker.tgz \
&& rm -rf docker.tgz \
&& cp docker/docker /usr/bin/docker \
&& rm -rf docker \
&& mkdir -p /usr/local/lib/docker/cli-plugins \
&& curl -fLo /usr/local/lib/docker/cli-plugins/docker-buildx \
"https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${TARGETARCH}" \
&& chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx \
&& groupadd docker --gid 123 \
&& usermod -aG docker root
# RUN export RUNNER_ARCH=${TARGETARCH} \
# && if [ "$RUNNER_ARCH" = "amd64" ]; then export DOCKER_ARCH=x86_64 ; fi \
# && if [ "$RUNNER_ARCH" = "arm64" ]; then export DOCKER_ARCH=aarch64 ; fi \
# && curl -fLo docker.tgz https://download.docker.com/${TARGETOS}/static/stable/${DOCKER_ARCH}/docker-${DOCKER_VERSION}.tgz \
# && tar zxvf docker.tgz \
# && rm -rf docker.tgz \
# && cp docker/docker /usr/bin/docker \
# && rm -rf docker \
# && mkdir -p /usr/local/lib/docker/cli-plugins \
# && curl -fLo /usr/local/lib/docker/cli-plugins/docker-buildx \
# "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${TARGETARCH}" \
# && chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx \
# && groupadd docker --gid 123 \
# && usermod -aG docker root

0 comments on commit 71d4ee2

Please sign in to comment.