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

Merge branch 'develop' into 'main' 

Merging develop into main

See merge request !57
parents 84510911 43887fd9
No related branches found
No related tags found
1 merge request!57Merging develop into main
Pipeline #980703 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
Dockerfile
+ 2
− 2
View file @ c93651e6
...@@ -13,7 +13,7 @@ LABEL com.example.vendor="LakeDrops" \ ...@@ -13,7 +13,7 @@ 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.18.1
ARG buildx_version=0.11.0 ARG buildx_version=0.11.2
ARG glibc_version=2.35-r1 ARG glibc_version=2.35-r1
ARG apkArch ARG apkArch
ARG dockerArch ARG dockerArch
...@@ -21,7 +21,7 @@ ARG DOCKER_CHANNEL=stable ...@@ -21,7 +21,7 @@ ARG DOCKER_CHANNEL=stable
ARG DOCKER_VERSION=24.0.2 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.31.0 ARG GLAB_VERSION=1.32.0
ADD usrbin/column /usr/bin/column ADD usrbin/column /usr/bin/column
ADD bin/* /usr/local/bin/ ADD bin/* /usr/local/bin/
......
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