From 2c270bbf2aba6fd65987982e368b2bfcf0a5ebc5 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 9 Apr 2024 02:42:45 +0000 Subject: [PATCH 1/4] update tests using github --- .github/workflows/codeql-analysis.yml | 20 ++++++++ .github/workflows/linter.yml | 20 ++++++++ .github/workflows/tests.yml | 28 +++++++++++ .travis.yml | 17 ------- Dockerfile => Dockerfile-php-8.0 | 1 + Dockerfile-php-8.1 | 69 +++++++++++++++++++++++++++ Dockerfile-php-8.2 | 69 +++++++++++++++++++++++++++ Dockerfile-php-8.3 | 69 +++++++++++++++++++++++++++ docker-compose.yml | 1 + 9 files changed, 277 insertions(+), 17 deletions(-) create mode 100644 .github/workflows/codeql-analysis.yml create mode 100644 .github/workflows/linter.yml create mode 100644 .github/workflows/tests.yml delete mode 100644 .travis.yml rename Dockerfile => Dockerfile-php-8.0 (99%) create mode 100644 Dockerfile-php-8.1 create mode 100644 Dockerfile-php-8.2 create mode 100644 Dockerfile-php-8.3 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 0000000000..cc514f2d8c --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,20 @@ +name: "CodeQL" + +on: [ pull_request ] +jobs: + lint: + name: CodeQL + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + with: + fetch-depth: 2 + + - run: git checkout HEAD^2 + + - name: Run CodeQL + run: | + docker run --rm -v $PWD:/app composer sh -c \ + "composer install --profile --ignore-platform-reqs && composer analyse" \ No newline at end of file diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml new file mode 100644 index 0000000000..51bf3e25c2 --- /dev/null +++ b/.github/workflows/linter.yml @@ -0,0 +1,20 @@ +name: "Linter" + +on: [ pull_request ] +jobs: + lint: + name: Linter + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + with: + fetch-depth: 2 + + - run: git checkout HEAD^2 + + - name: Run Linter + run: | + docker run --rm -v $PWD:/app composer sh -c \ + "composer install --profile --ignore-platform-reqs && composer lint" \ No newline at end of file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000000..60926cf2d0 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,28 @@ +name: "Tests" + +on: [ pull_request ] +jobs: + lint: + name: Tests + runs-on: ubuntu-latest + strategy: + matrix: + php-versions: ['8.0', '8.1', '8.2', '8.3'] # add PHP versions as required + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + with: + fetch-depth: 2 + + - run: git checkout HEAD^2 + + - name: Build + run: | + export PHP_VERSION=${{ matrix.php-versions }} + docker compose build + docker compose up -d + sleep 10 + + - name: Run Tests + run: docker compose exec tests vendor/bin/phpunit \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 95bcf3ef6f..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,17 +0,0 @@ -language: php -php: 8.0 -services: - - docker - -notifications: - email: - - team@appwrite.io - -before_script: - - composer install --ignore-platform-reqs - -script: - - docker-compose up -d - - docker-compose exec tests vendor/bin/pint --test - - docker-compose exec tests vendor/bin/phpstan analyse - - docker-compose exec tests vendor/bin/phpunit \ No newline at end of file diff --git a/Dockerfile b/Dockerfile-php-8.0 similarity index 99% rename from Dockerfile rename to Dockerfile-php-8.0 index 45b1750e2c..76469e59c5 100755 --- a/Dockerfile +++ b/Dockerfile-php-8.0 @@ -66,3 +66,4 @@ COPY --from=mongodb /usr/local/lib/php/extensions/no-debug-non-zts-20200930/mong COPY . /usr/src/code CMD [ "tail", "-f", "/dev/null" ] + diff --git a/Dockerfile-php-8.1 b/Dockerfile-php-8.1 new file mode 100644 index 0000000000..76469e59c5 --- /dev/null +++ b/Dockerfile-php-8.1 @@ -0,0 +1,69 @@ +FROM composer:2.0 as composer + +ARG TESTING=false +ENV TESTING=$TESTING + +WORKDIR /usr/local/src/ + +COPY composer.lock /usr/local/src/ +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 + +ENV PHP_SWOOLE_VERSION=v4.8.0 \ + 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 \ + && 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 \ + git clone --depth 1 --branch $PHP_MONGO_VERSION https://github.com/mongodb/mongo-php-driver.git \ + && cd mongo-php-driver \ + && git submodule update --init \ + && phpize \ + && ./configure \ + && make && make install + +FROM compile as final + +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" + +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 +COPY . /usr/src/code + +CMD [ "tail", "-f", "/dev/null" ] + diff --git a/Dockerfile-php-8.2 b/Dockerfile-php-8.2 new file mode 100644 index 0000000000..76469e59c5 --- /dev/null +++ b/Dockerfile-php-8.2 @@ -0,0 +1,69 @@ +FROM composer:2.0 as composer + +ARG TESTING=false +ENV TESTING=$TESTING + +WORKDIR /usr/local/src/ + +COPY composer.lock /usr/local/src/ +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 + +ENV PHP_SWOOLE_VERSION=v4.8.0 \ + 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 \ + && 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 \ + git clone --depth 1 --branch $PHP_MONGO_VERSION https://github.com/mongodb/mongo-php-driver.git \ + && cd mongo-php-driver \ + && git submodule update --init \ + && phpize \ + && ./configure \ + && make && make install + +FROM compile as final + +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" + +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 +COPY . /usr/src/code + +CMD [ "tail", "-f", "/dev/null" ] + diff --git a/Dockerfile-php-8.3 b/Dockerfile-php-8.3 new file mode 100644 index 0000000000..76469e59c5 --- /dev/null +++ b/Dockerfile-php-8.3 @@ -0,0 +1,69 @@ +FROM composer:2.0 as composer + +ARG TESTING=false +ENV TESTING=$TESTING + +WORKDIR /usr/local/src/ + +COPY composer.lock /usr/local/src/ +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 + +ENV PHP_SWOOLE_VERSION=v4.8.0 \ + 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 \ + && 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 \ + git clone --depth 1 --branch $PHP_MONGO_VERSION https://github.com/mongodb/mongo-php-driver.git \ + && cd mongo-php-driver \ + && git submodule update --init \ + && phpize \ + && ./configure \ + && make && make install + +FROM compile as final + +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" + +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 +COPY . /usr/src/code + +CMD [ "tail", "-f", "/dev/null" ] + diff --git a/docker-compose.yml b/docker-compose.yml index 554a98dea4..c654d8ae9c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,7 @@ services: container_name: utopia-mongo-test-1 build: context: . + dockerfile: Dockerfile-php-${PHP_VERSION:-8.3} networks: - database volumes: From 8eb417b7d281a5f170969815effbfcd5183fdd67 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 9 Apr 2024 02:47:55 +0000 Subject: [PATCH 2/4] fix dockerfiles --- Dockerfile-php-8.1 | 6 +++--- Dockerfile-php-8.2 | 6 +++--- Dockerfile-php-8.3 | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile-php-8.1 b/Dockerfile-php-8.1 index 76469e59c5..44bb332a15 100644 --- a/Dockerfile-php-8.1 +++ b/Dockerfile-php-8.1 @@ -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 php:8.0-cli-alpine as compile +FROM php:8.1-cli-alpine as compile ENV PHP_SWOOLE_VERSION=v4.8.0 \ PHP_MONGO_VERSION=1.11.1 @@ -59,8 +59,8 @@ 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/ +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 COPY . /usr/src/code diff --git a/Dockerfile-php-8.2 b/Dockerfile-php-8.2 index 76469e59c5..d9e925123f 100644 --- a/Dockerfile-php-8.2 +++ b/Dockerfile-php-8.2 @@ -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 php:8.0-cli-alpine as compile +FROM php:8.2-cli-alpine as compile ENV PHP_SWOOLE_VERSION=v4.8.0 \ PHP_MONGO_VERSION=1.11.1 @@ -59,8 +59,8 @@ 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/ +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 COPY . /usr/src/code diff --git a/Dockerfile-php-8.3 b/Dockerfile-php-8.3 index 76469e59c5..db353eeb26 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 php:8.0-cli-alpine as compile +FROM php:8.3-cli-alpine as compile ENV PHP_SWOOLE_VERSION=v4.8.0 \ PHP_MONGO_VERSION=1.11.1 @@ -59,8 +59,8 @@ 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/ +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 COPY . /usr/src/code From 343a6e496b427e34764808fe0f3b8c6294d56e02 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 9 Apr 2024 02:55:05 +0000 Subject: [PATCH 3/4] update swoole version --- Dockerfile-php-8.1 | 2 +- Dockerfile-php-8.2 | 2 +- Dockerfile-php-8.3 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile-php-8.1 b/Dockerfile-php-8.1 index 44bb332a15..e16add8c63 100644 --- a/Dockerfile-php-8.1 +++ b/Dockerfile-php-8.1 @@ -13,7 +13,7 @@ RUN composer update --ignore-platform-reqs --optimize-autoloader \ FROM php:8.1-cli-alpine as compile -ENV PHP_SWOOLE_VERSION=v4.8.0 \ +ENV PHP_SWOOLE_VERSION=v5.1.2 \ PHP_MONGO_VERSION=1.11.1 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/Dockerfile-php-8.2 b/Dockerfile-php-8.2 index d9e925123f..e460964af1 100644 --- a/Dockerfile-php-8.2 +++ b/Dockerfile-php-8.2 @@ -13,7 +13,7 @@ RUN composer update --ignore-platform-reqs --optimize-autoloader \ FROM php:8.2-cli-alpine as compile -ENV PHP_SWOOLE_VERSION=v4.8.0 \ +ENV PHP_SWOOLE_VERSION=v5.1.2 \ PHP_MONGO_VERSION=1.11.1 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/Dockerfile-php-8.3 b/Dockerfile-php-8.3 index db353eeb26..8dcf9da940 100644 --- a/Dockerfile-php-8.3 +++ b/Dockerfile-php-8.3 @@ -13,7 +13,7 @@ RUN composer update --ignore-platform-reqs --optimize-autoloader \ FROM php:8.3-cli-alpine as compile -ENV PHP_SWOOLE_VERSION=v4.8.0 \ +ENV PHP_SWOOLE_VERSION="v5.1.2" \ PHP_MONGO_VERSION=1.11.1 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone From d9ae41fc3e4c5b0b596fdcd501a74e757f159e16 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 9 Apr 2024 03:23:35 +0000 Subject: [PATCH 4/4] composer install --- .github/workflows/tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 60926cf2d0..12495e9a9f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,6 +17,11 @@ jobs: - run: git checkout HEAD^2 + - name: Compose install + run: | + docker run --rm -v $PWD:/app composer sh -c \ + "composer install --profile --ignore-platform-reqs" + - name: Build run: | export PHP_VERSION=${{ matrix.php-versions }}