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

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !40
parents 61a248f3 291a0941
Branches
No related tags found
1 merge request!40Merging develop into main
Pipeline #783702 passed
......@@ -13,6 +13,7 @@ LABEL com.example.vendor="LakeDrops" \
ARG ALPINE_VERSION
ARG PHP_MAJOR_VERSION
ARG compose_version=2.16.0
ARG buildx_version=0.10.3
ARG glibc_version=2.35-r0
ARG apkArch
ARG dockerArch
......@@ -89,9 +90,14 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
chmod +x /usr/local/bin/ahoy && \
\
mkdir -p /usr/local/lib/docker/cli-plugins && \
\
curl -SL https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose && \
chmod +x /usr/local/lib/docker/cli-plugins/docker-compose && \
\
curl -SL https://github.com/docker/buildx/releases/download/v${buildx_version}/buildx-v${buildx_version}.linux-amd64 -o /usr/local/lib/docker/cli-plugins/docker-buildx && \
chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx && \
docker buildx install && \
\
wget -q https://getcomposer.org/composer.phar -O /usr/local/bin/composer && \
chmod +x /usr/local/bin/composer && \
chmod ugo+w /usr/local/bin/composer && \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment