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

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !49
parents 5de50079 b7ba6db9
No related branches found
No related tags found
1 merge request!49Merging develop into main
Pipeline #860654 passed
......@@ -12,16 +12,16 @@ LABEL com.example.vendor="LakeDrops" \
ARG ALPINE_VERSION
ARG PHP_MAJOR_VERSION
ARG compose_version=2.17.2
ARG compose_version=2.17.3
ARG buildx_version=0.10.3
ARG glibc_version=2.35-r0
ARG glibc_version=2.35-r1
ARG apkArch
ARG dockerArch
ARG DOCKER_CHANNEL=stable
ARG DOCKER_VERSION=23.0.3
ARG GIT_EXTRAS_VERSION=6.5.0
ARG AHOY_VERSION=2.0.2
ARG GLAB_VERSION=1.27.1
ARG GIT_EXTRAS_VERSION=7.0.0
ARG AHOY_VERSION=2.1.1
ARG GLAB_VERSION=1.29.1
ADD usrbin/column /usr/bin/column
ADD bin/* /usr/local/bin/
......@@ -86,7 +86,7 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
apk add --no-cache --allow-untrusted glab_${GLAB_VERSION}_Linux_x86_64.apk && \
rm glab_${GLAB_VERSION}_Linux_x86_64.apk && \
\
wget -q https://github.com/ahoy-cli/ahoy/releases/download/${AHOY_VERSION}/ahoy-bin-`uname -s`-amd64 -O /usr/local/bin/ahoy && \
wget -q https://github.com/ahoy-cli/ahoy/releases/download/v${AHOY_VERSION}/ahoy-bin-`uname -s`-amd64 -O /usr/local/bin/ahoy && \
chmod +x /usr/local/bin/ahoy && \
\
mkdir -p /usr/local/lib/docker/cli-plugins && \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment