From 4d6d5294e4ab15c1f0bd5e5fd306ccaf778fb715 Mon Sep 17 00:00:00 2001
From: Steven Nguyen <stnguyen90@users.noreply.github.com>
Date: Tue, 17 Sep 2024 13:20:10 -0700
Subject: [PATCH 1/2] chore: bump base PHP to 8.3.11-cli-alpine3.20
---
Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 39fbb88..96b6d74 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3.10-cli-alpine3.20 as compile
+FROM php:8.3.11-cli-alpine3.20 as compile
ENV PHP_REDIS_VERSION="6.0.2" \
PHP_MONGODB_VERSION="1.19.3" \
@@ -149,7 +149,7 @@ RUN \
./configure && \
make && make install
-FROM php:8.3.7-cli-alpine3.19 as final
+FROM php:8.3.11-cli-alpine3.20 as final
LABEL maintainer="team@appwrite.io"
From 25a0d99c32f0c15e8c6b80651bafb3ab54b10dee Mon Sep 17 00:00:00 2001
From: Steven Nguyen <stnguyen90@users.noreply.github.com>
Date: Tue, 17 Sep 2024 13:20:34 -0700
Subject: [PATCH 2/2] chore: bump docker-compose version to v2.29.5
---
Dockerfile | 2 +-
tests.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 96b6d74..96b994b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -154,7 +154,7 @@ FROM php:8.3.11-cli-alpine3.20 as final
LABEL maintainer="team@appwrite.io"
ENV DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker}
-ENV DOCKER_COMPOSE_VERSION="v2.29.1"
+ENV DOCKER_COMPOSE_VERSION="v2.29.5"
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/tests.yaml b/tests.yaml
index 2f9a7d7..6ac93f1 100644
--- a/tests.yaml
+++ b/tests.yaml
@@ -116,7 +116,7 @@ commandTests:
- name: 'Docker command'
command: "docker"
args: ["--version"]
- expectedOutput: ["Docker version 25.*"]
+ expectedOutput: ["Docker version 26.*"]
- name: 'PHP info'
command: "php"
args: ["-m"]