Merge pull request #55 from appwrite/chore-fix-vulnerabilities

Fix 0.10.5 vulnerabilities

Author: loks0n

Dockerfile

@@ -170,9 +170,6 @@ FROM $BASEIMAGE AS final
 
 LABEL maintainer="team@appwrite.io"
 
-ENV DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker}
-ENV DOCKER_COMPOSE_VERSION="v2.33.1"
-
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN set -ex \
@@ -181,6 +178,7 @@ RUN set -ex \
 
 RUN \
   apk update \
+  && apk upgrade \
   && apk add --no-cache --virtual .deps \
   linux-headers \
   make \
@@ -209,19 +207,14 @@ RUN \
   libmaxminddb-dev \
   certbot \
   docker-cli \
+  docker-cli-compose \
   libgomp \
   git \
   zip \
   && docker-php-ext-install sockets pdo_mysql pdo_pgsql intl \
   && apk del .deps \
   && rm -rf /var/cache/apk/*
 
-RUN \
-  mkdir -p $DOCKER_CONFIG/cli-plugins \
-  && 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
-
 WORKDIR /usr/src/code
 
 COPY --from=swoole /usr/local/lib/php/extensions/no-debug-non-zts-20230831/swoole.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/

tests.yaml

@@ -17,6 +17,10 @@ commandTests:
     command: "docker"
     args: ["--version"]
     expectedOutput: ["Docker version 28.*"]
+  - name: 'Docker Compose command'
+    command: "docker"
+    args: ["compose", "version"]
+    expectedOutput: ["Docker Compose version v.*"]
   - name: 'PHP modules'
     command: "php"
     args: ["-m"]