From 42991ee27b7881bd1ab68fcfe6c989ec554a3018 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 21 May 2024 06:21:24 +0000 Subject: [PATCH] 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"