From 510d77fa38c0959e0ca44ef913669558ed7767b6 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 21 May 2024 11:37:21 +0545 Subject: [PATCH 1/5] Update Dockerfile-php-8.0 --- Dockerfile-php-8.0 | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/Dockerfile-php-8.0 b/Dockerfile-php-8.0 index 76469e59c5..6275cb1e39 100755 --- a/Dockerfile-php-8.0 +++ b/Dockerfile-php-8.0 @@ -11,10 +11,9 @@ COPY composer.json /usr/local/src/ RUN composer update --ignore-platform-reqs --optimize-autoloader \ --no-plugins --no-scripts --prefer-dist -FROM php:8.0-cli-alpine as compile +FROM appwrite/utopia-base:php-8.0-0.1.0 as compile -ENV PHP_SWOOLE_VERSION=v4.8.0 \ - PHP_MONGO_VERSION=1.11.1 +ENV PHP_MONGO_VERSION=1.11.1 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone @@ -24,15 +23,6 @@ RUN \ && docker-php-ext-install opcache pgsql pdo_mysql pdo_pgsql \ && rm -rf /var/cache/apk/* -## Swoole Extension -FROM compile AS swoole -RUN \ - git clone --depth 1 --branch $PHP_SWOOLE_VERSION https://github.com/swoole/swoole-src.git \ - && cd swoole-src \ - && phpize \ - && ./configure --enable-http2 \ - && make && make install - ## MongoDB Extension FROM compile AS mongodb RUN \ @@ -49,7 +39,6 @@ LABEL maintainer="team@appwrite.io" WORKDIR /usr/src/code -RUN echo extension=swoole.so >> /usr/local/etc/php/conf.d/swoole.ini RUN echo extension=mongodb.so >> /usr/local/etc/php/conf.d/mongodb.ini RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" @@ -59,7 +48,6 @@ RUN echo "opcache.enable_cli=1" >> $PHP_INI_DIR/php.ini RUN echo "memory_limit=1024M" >> $PHP_INI_DIR/php.ini COPY --from=composer /usr/local/src/vendor /usr/src/code/vendor -COPY --from=swoole /usr/local/lib/php/extensions/no-debug-non-zts-20200930/swoole.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/ COPY --from=mongodb /usr/local/lib/php/extensions/no-debug-non-zts-20200930/mongodb.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/ # Add Source Code From e1dc88627301d36bf3a5120e0c578ea545a43cca Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 21 May 2024 06:19:53 +0000 Subject: [PATCH 2/5] cleanup --- Dockerfile-php-8.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-php-8.0 b/Dockerfile-php-8.0 index 6275cb1e39..b9f9f27375 100755 --- a/Dockerfile-php-8.0 +++ b/Dockerfile-php-8.0 @@ -19,7 +19,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN \ apk update \ - && apk add --no-cache postgresql-libs postgresql-dev make automake autoconf gcc g++ git brotli-dev \ + && apk add --no-cache postgresql-libs postgresql-dev make automake \ && docker-php-ext-install opcache pgsql pdo_mysql pdo_pgsql \ && rm -rf /var/cache/apk/* From 42991ee27b7881bd1ab68fcfe6c989ec554a3018 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 21 May 2024 06:21:24 +0000 Subject: [PATCH 3/5] cleanup rest dockerfiles --- Dockerfile-php-8.1 | 17 +++-------------- Dockerfile-php-8.2 | 17 +++-------------- Dockerfile-php-8.3 | 17 +++-------------- 3 files changed, 9 insertions(+), 42 deletions(-) diff --git a/Dockerfile-php-8.1 b/Dockerfile-php-8.1 index e16add8c63..f5f01567c0 100644 --- a/Dockerfile-php-8.1 +++ b/Dockerfile-php-8.1 @@ -11,28 +11,18 @@ COPY composer.json /usr/local/src/ RUN composer update --ignore-platform-reqs --optimize-autoloader \ --no-plugins --no-scripts --prefer-dist -FROM php:8.1-cli-alpine as compile +FROM appwrite/utopia-base:php-8.1-0.1.0 as compile -ENV PHP_SWOOLE_VERSION=v5.1.2 \ - PHP_MONGO_VERSION=1.11.1 +ENV PHP_MONGO_VERSION=1.11.1 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN \ apk update \ - && apk add --no-cache postgresql-libs postgresql-dev make automake autoconf gcc g++ git brotli-dev \ + && apk add --no-cache postgresql-libs postgresql-dev make automake \ && docker-php-ext-install opcache pgsql pdo_mysql pdo_pgsql \ && rm -rf /var/cache/apk/* -## Swoole Extension -FROM compile AS swoole -RUN \ - git clone --depth 1 --branch $PHP_SWOOLE_VERSION https://github.com/swoole/swoole-src.git \ - && cd swoole-src \ - && phpize \ - && ./configure --enable-http2 \ - && make && make install - ## MongoDB Extension FROM compile AS mongodb RUN \ @@ -49,7 +39,6 @@ LABEL maintainer="team@appwrite.io" WORKDIR /usr/src/code -RUN echo extension=swoole.so >> /usr/local/etc/php/conf.d/swoole.ini RUN echo extension=mongodb.so >> /usr/local/etc/php/conf.d/mongodb.ini RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" diff --git a/Dockerfile-php-8.2 b/Dockerfile-php-8.2 index e460964af1..37cbe3c536 100644 --- a/Dockerfile-php-8.2 +++ b/Dockerfile-php-8.2 @@ -11,28 +11,18 @@ COPY composer.json /usr/local/src/ RUN composer update --ignore-platform-reqs --optimize-autoloader \ --no-plugins --no-scripts --prefer-dist -FROM php:8.2-cli-alpine as compile +FROM appwrite/utopia-base:php-8.2-0.1.0 as compile -ENV PHP_SWOOLE_VERSION=v5.1.2 \ - PHP_MONGO_VERSION=1.11.1 +ENV PHP_MONGO_VERSION=1.11.1 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN \ apk update \ - && apk add --no-cache postgresql-libs postgresql-dev make automake autoconf gcc g++ git brotli-dev \ + && apk add --no-cache postgresql-libs postgresql-dev make automake \ && docker-php-ext-install opcache pgsql pdo_mysql pdo_pgsql \ && rm -rf /var/cache/apk/* -## Swoole Extension -FROM compile AS swoole -RUN \ - git clone --depth 1 --branch $PHP_SWOOLE_VERSION https://github.com/swoole/swoole-src.git \ - && cd swoole-src \ - && phpize \ - && ./configure --enable-http2 \ - && make && make install - ## MongoDB Extension FROM compile AS mongodb RUN \ @@ -49,7 +39,6 @@ LABEL maintainer="team@appwrite.io" WORKDIR /usr/src/code -RUN echo extension=swoole.so >> /usr/local/etc/php/conf.d/swoole.ini RUN echo extension=mongodb.so >> /usr/local/etc/php/conf.d/mongodb.ini RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" diff --git a/Dockerfile-php-8.3 b/Dockerfile-php-8.3 index 8dcf9da940..63cdfc01d1 100644 --- a/Dockerfile-php-8.3 +++ b/Dockerfile-php-8.3 @@ -11,28 +11,18 @@ COPY composer.json /usr/local/src/ RUN composer update --ignore-platform-reqs --optimize-autoloader \ --no-plugins --no-scripts --prefer-dist -FROM php:8.3-cli-alpine as compile +FROM appwrite/utopia-base:php-8.0-0.1.0 as compile -ENV PHP_SWOOLE_VERSION="v5.1.2" \ - PHP_MONGO_VERSION=1.11.1 +ENV PHP_MONGO_VERSION=1.11.1 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN \ apk update \ - && apk add --no-cache postgresql-libs postgresql-dev make automake autoconf gcc g++ git brotli-dev \ + && apk add --no-cache postgresql-libs postgresql-dev make automake \ && docker-php-ext-install opcache pgsql pdo_mysql pdo_pgsql \ && rm -rf /var/cache/apk/* -## Swoole Extension -FROM compile AS swoole -RUN \ - git clone --depth 1 --branch $PHP_SWOOLE_VERSION https://github.com/swoole/swoole-src.git \ - && cd swoole-src \ - && phpize \ - && ./configure --enable-http2 \ - && make && make install - ## MongoDB Extension FROM compile AS mongodb RUN \ @@ -49,7 +39,6 @@ LABEL maintainer="team@appwrite.io" WORKDIR /usr/src/code -RUN echo extension=swoole.so >> /usr/local/etc/php/conf.d/swoole.ini RUN echo extension=mongodb.so >> /usr/local/etc/php/conf.d/mongodb.ini RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" From 09e462c371d98d5594e4435e1023417f07ad66bc Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 21 May 2024 06:33:08 +0000 Subject: [PATCH 4/5] fix dependencies --- Dockerfile-php-8.0 | 2 +- Dockerfile-php-8.1 | 3 +-- Dockerfile-php-8.2 | 3 +-- Dockerfile-php-8.3 | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Dockerfile-php-8.0 b/Dockerfile-php-8.0 index b9f9f27375..0d3c013269 100755 --- a/Dockerfile-php-8.0 +++ b/Dockerfile-php-8.0 @@ -19,7 +19,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN \ apk update \ - && apk add --no-cache postgresql-libs postgresql-dev make automake \ + && apk add --no-cache postgresql-libs postgresql-dev make automake autoconf gcc g++ git \ && docker-php-ext-install opcache pgsql pdo_mysql pdo_pgsql \ && rm -rf /var/cache/apk/* diff --git a/Dockerfile-php-8.1 b/Dockerfile-php-8.1 index f5f01567c0..97bfddca2f 100644 --- a/Dockerfile-php-8.1 +++ b/Dockerfile-php-8.1 @@ -19,7 +19,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN \ apk update \ - && apk add --no-cache postgresql-libs postgresql-dev make automake \ + && apk add --no-cache postgresql-libs postgresql-dev make automake autoconf gcc g++ git \ && docker-php-ext-install opcache pgsql pdo_mysql pdo_pgsql \ && rm -rf /var/cache/apk/* @@ -48,7 +48,6 @@ RUN echo "opcache.enable_cli=1" >> $PHP_INI_DIR/php.ini RUN echo "memory_limit=1024M" >> $PHP_INI_DIR/php.ini COPY --from=composer /usr/local/src/vendor /usr/src/code/vendor -COPY --from=swoole /usr/local/lib/php/extensions/no-debug-non-zts-20210902/swoole.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ COPY --from=mongodb /usr/local/lib/php/extensions/no-debug-non-zts-20210902/mongodb.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ # Add Source Code diff --git a/Dockerfile-php-8.2 b/Dockerfile-php-8.2 index 37cbe3c536..214e3727e0 100644 --- a/Dockerfile-php-8.2 +++ b/Dockerfile-php-8.2 @@ -19,7 +19,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN \ apk update \ - && apk add --no-cache postgresql-libs postgresql-dev make automake \ + && apk add --no-cache postgresql-libs postgresql-dev make automake autoconf gcc g++ git \ && docker-php-ext-install opcache pgsql pdo_mysql pdo_pgsql \ && rm -rf /var/cache/apk/* @@ -48,7 +48,6 @@ RUN echo "opcache.enable_cli=1" >> $PHP_INI_DIR/php.ini RUN echo "memory_limit=1024M" >> $PHP_INI_DIR/php.ini COPY --from=composer /usr/local/src/vendor /usr/src/code/vendor -COPY --from=swoole /usr/local/lib/php/extensions/no-debug-non-zts-20220829/swoole.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ COPY --from=mongodb /usr/local/lib/php/extensions/no-debug-non-zts-20220829/mongodb.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ # Add Source Code diff --git a/Dockerfile-php-8.3 b/Dockerfile-php-8.3 index 63cdfc01d1..b6fe10a50c 100644 --- a/Dockerfile-php-8.3 +++ b/Dockerfile-php-8.3 @@ -19,7 +19,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN \ apk update \ - && apk add --no-cache postgresql-libs postgresql-dev make automake \ + && apk add --no-cache postgresql-libs postgresql-dev make automake autoconf gcc g++ git \ && docker-php-ext-install opcache pgsql pdo_mysql pdo_pgsql \ && rm -rf /var/cache/apk/* @@ -48,7 +48,6 @@ RUN echo "opcache.enable_cli=1" >> $PHP_INI_DIR/php.ini RUN echo "memory_limit=1024M" >> $PHP_INI_DIR/php.ini COPY --from=composer /usr/local/src/vendor /usr/src/code/vendor -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/ COPY --from=mongodb /usr/local/lib/php/extensions/no-debug-non-zts-20230831/mongodb.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/ # Add Source Code From 24f6cb7adbe934f3a3ca334a278e68916d87a15e Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 21 May 2024 06:42:41 +0000 Subject: [PATCH 5/5] fix php version --- Dockerfile-php-8.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-php-8.3 b/Dockerfile-php-8.3 index b6fe10a50c..cb031e1f47 100644 --- a/Dockerfile-php-8.3 +++ b/Dockerfile-php-8.3 @@ -11,7 +11,7 @@ COPY composer.json /usr/local/src/ RUN composer update --ignore-platform-reqs --optimize-autoloader \ --no-plugins --no-scripts --prefer-dist -FROM appwrite/utopia-base:php-8.0-0.1.0 as compile +FROM appwrite/utopia-base:php-8.3-0.1.0 as compile ENV PHP_MONGO_VERSION=1.11.1