Skip to content
Snippets Groups Projects
Commit 1d15b442 authored by jurgenhaas's avatar jurgenhaas
Browse files

#35 

#34
parent 2425c576
No related branches found
Tags v1.7.1
1 merge request!52Merging develop into main
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 4 deletions
Dockerfile
+ 4
− 4
View file @ 1d15b442
...@@ -12,13 +12,13 @@ LABEL com.example.vendor="LakeDrops" \ ...@@ -12,13 +12,13 @@ LABEL com.example.vendor="LakeDrops" \
ARG ALPINE_VERSION ARG ALPINE_VERSION
ARG PHP_MAJOR_VERSION ARG PHP_MAJOR_VERSION
ARG compose_version=2.18.1 ARG compose_version=2.19.0
ARG buildx_version=0.10.5 ARG buildx_version=0.11.0
ARG glibc_version=2.35-r1 ARG glibc_version=2.35-r1
ARG apkArch ARG apkArch
ARG dockerArch ARG dockerArch
ARG DOCKER_CHANNEL=stable ARG DOCKER_CHANNEL=stable
ARG DOCKER_VERSION=23.0.3 ARG DOCKER_VERSION=24.0.2
ARG GIT_EXTRAS_VERSION=7.0.0 ARG GIT_EXTRAS_VERSION=7.0.0
ARG AHOY_VERSION=2.1.1 ARG AHOY_VERSION=2.1.1
ARG GLAB_VERSION=1.30.0 ARG GLAB_VERSION=1.30.0
...@@ -29,7 +29,7 @@ ADD etc/* /etc/ ...@@ -29,7 +29,7 @@ ADD etc/* /etc/
RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
set -eux && \ set -eux && \
\ \
apkArch="$(apk --print-arch)" && \ apkArch="$(apk --print-arch)" && \
case "$apkArch" in \ case "$apkArch" in \
x86_64) dockerArch='x86_64' ;; \ x86_64) dockerArch='x86_64' ;; \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment