From 4620c59dde68b9f159933bdf27bd3d4c0e127964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Fri, 10 Jun 2022 11:37:39 +0000 Subject: [PATCH] Bug fix, use dynamic ARCH --- Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 70424b91f..f013b7362 100755 --- a/Dockerfile +++ b/Dockerfile @@ -34,8 +34,7 @@ ENV PHP_REDIS_VERSION=5.3.7 \ PHP_SWOOLE_VERSION=v4.8.9 \ PHP_IMAGICK_VERSION=3.7.0 \ PHP_YAML_VERSION=2.2.2 \ - PHP_MAXMINDDB_VERSION=v1.11.0 \ - DOCKER_COMPOSE_VERSION=v2.5.0 + PHP_MAXMINDDB_VERSION=v1.11.0 RUN \ apk add --no-cache --virtual .deps \ @@ -131,7 +130,9 @@ LABEL maintainer="team@appwrite.io" ARG VERSION=dev ARG DEBUG=false ENV DEBUG=$DEBUG + ENV DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker} +ENV DOCKER_COMPOSE_VERSION=v2.5.0 ENV _APP_SERVER=swoole \ _APP_ENV=production \ @@ -241,7 +242,8 @@ RUN \ RUN \ mkdir -p $DOCKER_CONFIG/cli-plugins \ - && curl -SL https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-linux-$(uname -m) -o $DOCKER_CONFIG/cli-plugins/docker-compose \ + && ARCH=$(uname -m) && if [ $ARCH == "armv7l" ]; then $ARCH="armv7"; fi \ + && curl -SL https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-linux-$ARCH -o $DOCKER_CONFIG/cli-plugins/docker-compose \ && chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose RUN \