Merge 5b23eafd1e into 0baa4f6b09
This commit is contained in:
Nico Neumann
GitHub
commit
cc6ccb39ff
|
|
@ -6,6 +6,7 @@ ARG RUNNER_CONTAINER_HOOKS_VERSION
|
|||
# Docker and Docker Compose arguments
|
||||
ENV CHANNEL=stable
|
||||
ARG DOCKER_COMPOSE_VERSION=v2.23.0
|
||||
ARG BUILDX_VERSION=0.12.1
|
||||
ARG DUMB_INIT_VERSION=1.2.5
|
||||
|
||||
# Other arguments
|
||||
|
|
@ -149,6 +150,14 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
|
|||
&& which docker-compose \
|
||||
&& docker compose version
|
||||
|
||||
RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
|
||||
&& if [ "$ARCH" = "aarch64" ]; then export ARCH=arm64 ; fi \
|
||||
&& if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "i386" ]; then export ARCH=amd64 ; fi \
|
||||
&& mkdir -p /home/runner/.docker/cli-plugins \
|
||||
&& curl -fLo /home/runner/.docker/cli-plugins/docker-buildx \
|
||||
"https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${ARCH}" \
|
||||
&& chmod +x /home/runner/.docker/cli-plugins/docker-buildx
|
||||
|
||||
# Create folder structure here to avoid permission issues
|
||||
# when mounting the daemon.json file from a configmap.
|
||||
RUN mkdir -p /home/runner/.config/docker
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ ARG RUNNER_CONTAINER_HOOKS_VERSION
|
|||
# Docker and Docker Compose arguments
|
||||
ENV CHANNEL=stable
|
||||
ARG DOCKER_COMPOSE_VERSION=v2.23.0
|
||||
ARG BUILDX_VERSION=0.12.1
|
||||
ARG DUMB_INIT_VERSION=1.2.5
|
||||
ARG RUNNER_USER_UID=1001
|
||||
|
||||
|
|
@ -127,6 +128,14 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
|
|||
&& which docker-compose \
|
||||
&& docker compose version
|
||||
|
||||
RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
|
||||
&& if [ "$ARCH" = "aarch64" ]; then export ARCH=arm64 ; fi \
|
||||
&& if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "i386" ]; then export ARCH=amd64 ; fi \
|
||||
&& mkdir -p /home/runner/.docker/cli-plugins \
|
||||
&& curl -fLo /home/runner/.docker/cli-plugins/docker-buildx \
|
||||
"https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${ARCH}" \
|
||||
&& chmod +x /home/runner/.docker/cli-plugins/docker-buildx
|
||||
|
||||
# Create folder structure here to avoid permission issues
|
||||
# when mounting the daemon.json file from a configmap.
|
||||
RUN mkdir -p /home/runner/.config/docker
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ ARG RUNNER_CONTAINER_HOOKS_VERSION
|
|||
ARG CHANNEL=stable
|
||||
ARG DOCKER_VERSION=24.0.7
|
||||
ARG DOCKER_COMPOSE_VERSION=v2.23.0
|
||||
ARG BUILDX_VERSION=0.12.1
|
||||
ARG DUMB_INIT_VERSION=1.2.5
|
||||
|
||||
# Use 1001 and 121 for compatibility with GitHub-hosted runners
|
||||
|
|
@ -116,6 +117,14 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
|
|||
&& which docker-compose \
|
||||
&& docker compose version
|
||||
|
||||
RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
|
||||
&& if [ "$ARCH" = "aarch64" ]; then export ARCH=arm64 ; fi \
|
||||
&& if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "i386" ]; then export ARCH=amd64 ; fi \
|
||||
&& mkdir -p /usr/libexec/docker/cli-plugins \
|
||||
&& curl -fLo /usr/libexec/docker/cli-plugins/docker-buildx \
|
||||
"https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${ARCH}" \
|
||||
&& chmod +x /usr/libexec/docker/cli-plugins/docker-buildx
|
||||
|
||||
# We place the scripts in `/usr/bin` so that users who extend this image can
|
||||
# override them with scripts of the same name placed in `/usr/local/bin`.
|
||||
COPY entrypoint-dind.sh startup.sh logger.sh wait.sh graceful-stop.sh update-status /usr/bin/
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ ARG RUNNER_CONTAINER_HOOKS_VERSION
|
|||
ARG CHANNEL=stable
|
||||
ARG DOCKER_VERSION=24.0.7
|
||||
ARG DOCKER_COMPOSE_VERSION=v2.23.0
|
||||
ARG BUILDX_VERSION=0.12.1
|
||||
ARG DUMB_INIT_VERSION=1.2.5
|
||||
ARG RUNNER_USER_UID=1001
|
||||
ARG DOCKER_GROUP_GID=121
|
||||
|
|
@ -92,6 +93,14 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
|
|||
&& which docker-compose \
|
||||
&& docker compose version
|
||||
|
||||
RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
|
||||
&& if [ "$ARCH" = "aarch64" ]; then export ARCH=arm64 ; fi \
|
||||
&& if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "i386" ]; then export ARCH=amd64 ; fi \
|
||||
&& mkdir -p /usr/libexec/docker/cli-plugins \
|
||||
&& curl -fLo /usr/libexec/docker/cli-plugins/docker-buildx \
|
||||
"https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${ARCH}" \
|
||||
&& chmod +x /usr/libexec/docker/cli-plugins/docker-buildx
|
||||
|
||||
# We place the scripts in `/usr/bin` so that users who extend this image can
|
||||
# override them with scripts of the same name placed in `/usr/local/bin`.
|
||||
COPY entrypoint-dind.sh startup.sh logger.sh wait.sh graceful-stop.sh update-status /usr/bin/
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ ARG RUNNER_CONTAINER_HOOKS_VERSION
|
|||
ARG CHANNEL=stable
|
||||
ARG DOCKER_VERSION=24.0.7
|
||||
ARG DOCKER_COMPOSE_VERSION=v2.23.0
|
||||
ARG BUILDX_VERSION=0.12.1
|
||||
ARG DUMB_INIT_VERSION=1.2.5
|
||||
|
||||
# Use 1001 and 121 for compatibility with GitHub-hosted runners
|
||||
|
|
@ -113,6 +114,14 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
|
|||
&& which docker-compose \
|
||||
&& docker compose version
|
||||
|
||||
RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
|
||||
&& if [ "$ARCH" = "aarch64" ]; then export ARCH=arm64 ; fi \
|
||||
&& if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "i386" ]; then export ARCH=amd64 ; fi \
|
||||
&& mkdir -p /usr/libexec/docker/cli-plugins \
|
||||
&& curl -fLo /usr/libexec/docker/cli-plugins/docker-buildx \
|
||||
"https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${ARCH}" \
|
||||
&& chmod +x /usr/libexec/docker/cli-plugins/docker-buildx
|
||||
|
||||
# We place the scripts in `/usr/bin` so that users who extend this image can
|
||||
# override them with scripts of the same name placed in `/usr/local/bin`.
|
||||
COPY entrypoint.sh startup.sh logger.sh graceful-stop.sh update-status /usr/bin/
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ ARG RUNNER_CONTAINER_HOOKS_VERSION
|
|||
ARG CHANNEL=stable
|
||||
ARG DOCKER_VERSION=24.0.7
|
||||
ARG DOCKER_COMPOSE_VERSION=v2.23.0
|
||||
ARG BUILDX_VERSION=0.12.1
|
||||
ARG DUMB_INIT_VERSION=1.2.5
|
||||
ARG RUNNER_USER_UID=1001
|
||||
ARG DOCKER_GROUP_GID=121
|
||||
|
|
@ -90,6 +91,14 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
|
|||
&& which docker-compose \
|
||||
&& docker compose version
|
||||
|
||||
RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
|
||||
&& if [ "$ARCH" = "aarch64" ]; then export ARCH=arm64 ; fi \
|
||||
&& if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "i386" ]; then export ARCH=amd64 ; fi \
|
||||
&& mkdir -p /usr/libexec/docker/cli-plugins \
|
||||
&& curl -fLo /usr/libexec/docker/cli-plugins/docker-buildx \
|
||||
"https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${ARCH}" \
|
||||
&& chmod +x /usr/libexec/docker/cli-plugins/docker-buildx
|
||||
|
||||
# We place the scripts in `/usr/bin` so that users who extend this image can
|
||||
# override them with scripts of the same name placed in `/usr/local/bin`.
|
||||
COPY entrypoint.sh startup.sh logger.sh graceful-stop.sh update-status /usr/bin/
|
||||
|
|
|
|||
Loading…
Reference in New Issue