Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['8.0', '8.1', '8.2', '8.3', '8.4'] # add PHP versions as required
php-versions: ['8.1', '8.2', '8.3', '8.4'] # add PHP versions as required
steps:
- name: Checkout the repo
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['8.0', '8.1', '8.2', '8.3', '8.4'] # add PHP versions as required
php-versions: ['8.1', '8.2', '8.3', '8.4'] # add PHP versions as required
steps:
- name: Checkout the repo
uses: actions/checkout@v3
Expand Down
196 changes: 0 additions & 196 deletions php-8.0/Dockerfile

This file was deleted.

31 changes: 0 additions & 31 deletions php-8.0/tests.yaml

This file was deleted.

17 changes: 15 additions & 2 deletions php-8.1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ ENV PHP_REDIS_VERSION="6.1.0" \
PHP_BROTLI_VERSION="0.15.0" \
PHP_SNAPPY_VERSION="0.2.2" \
PHP_LZ4_VERSION="0.4.4" \
PHP_XDEBUG_VERSION="3.4.1"
PHP_XDEBUG_VERSION="3.4.1" \
PHP_MONGO_VERSION="2.2.1"

RUN \
apk add --no-cache --virtual .deps \
Expand All @@ -34,7 +35,8 @@ RUN \
zstd-dev \
brotli-dev \
lz4-dev \
curl-dev
curl-dev \
cmake

RUN docker-php-ext-install sockets

Expand Down Expand Up @@ -139,6 +141,15 @@ RUN \
./configure && \
make && make install

## MongoDB Extension
FROM compile AS mongodb
RUN \
git clone --depth 1 --recursive --branch $PHP_MONGO_VERSION https://github.com/mongodb/mongo-php-driver.git && \
cd mongo-php-driver && \
phpize && \
./configure && \
make && make install

FROM php:8.1-cli-alpine AS final

LABEL maintainer="team@appwrite.io"
Expand Down Expand Up @@ -179,6 +190,7 @@ COPY --from=brotli /usr/local/lib/php/extensions/no-debug-non-zts-20210902/brotl
COPY --from=lz4 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/lz4.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/
COPY --from=snappy /usr/local/lib/php/extensions/no-debug-non-zts-20210902/snappy.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/
COPY --from=xdebug /usr/local/lib/php/extensions/no-debug-non-zts-20210902/xdebug.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/

# Enable Extensions
RUN echo extension=swoole.so >> /usr/local/etc/php/conf.d/swoole.ini
Expand All @@ -190,6 +202,7 @@ RUN echo extension=zstd.so >> /usr/local/etc/php/conf.d/zstd.ini
RUN echo extension=brotli.so >> /usr/local/etc/php/conf.d/brotli.ini
RUN echo extension=lz4.so >> /usr/local/etc/php/conf.d/lz4.ini
RUN echo extension=snappy.so >> /usr/local/etc/php/conf.d/snappy.ini
RUN echo extension=mongodb.so >> /usr/local/etc/php/conf.d/mongodb.ini

EXPOSE 80

Expand Down
3 changes: 3 additions & 0 deletions php-8.1/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,7 @@ fileExistenceTests:
shouldExist: true
- name: 'Check snappy extension'
path: /usr/local/lib/php/extensions/no-debug-non-zts-20210902/snappy.so
shouldExist: true
- name: 'Check mongodb extension'
path: /usr/local/lib/php/extensions/no-debug-non-zts-20210902/mongodb.so
shouldExist: true
17 changes: 15 additions & 2 deletions php-8.2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ ENV PHP_REDIS_VERSION="6.1.0" \
PHP_BROTLI_VERSION="0.15.0" \
PHP_SNAPPY_VERSION="0.2.2" \
PHP_LZ4_VERSION="0.4.4" \
PHP_XDEBUG_VERSION="3.4.1"
PHP_XDEBUG_VERSION="3.4.1" \
PHP_MONGO_VERSION="2.2.1"

RUN \
apk add --no-cache --virtual .deps \
Expand All @@ -34,7 +35,8 @@ RUN \
zstd-dev \
brotli-dev \
lz4-dev \
curl-dev
curl-dev \
cmake

RUN docker-php-ext-install sockets

Expand Down Expand Up @@ -139,6 +141,15 @@ RUN \
./configure && \
make && make install

## MongoDB Extension
FROM compile AS mongodb
RUN \
git clone --depth 1 --recursive --branch $PHP_MONGO_VERSION https://github.com/mongodb/mongo-php-driver.git && \
cd mongo-php-driver && \
phpize && \
./configure && \
make && make install

FROM php:8.2-cli-alpine AS final

LABEL maintainer="team@appwrite.io"
Expand Down Expand Up @@ -179,6 +190,7 @@ COPY --from=brotli /usr/local/lib/php/extensions/no-debug-non-zts-20220829/brotl
COPY --from=lz4 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/lz4.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/
COPY --from=snappy /usr/local/lib/php/extensions/no-debug-non-zts-20220829/snappy.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/
COPY --from=xdebug /usr/local/lib/php/extensions/no-debug-non-zts-20220829/xdebug.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/

# Enable Extensions
RUN echo extension=swoole.so >> /usr/local/etc/php/conf.d/swoole.ini
Expand All @@ -190,6 +202,7 @@ RUN echo extension=zstd.so >> /usr/local/etc/php/conf.d/zstd.ini
RUN echo extension=brotli.so >> /usr/local/etc/php/conf.d/brotli.ini
RUN echo extension=lz4.so >> /usr/local/etc/php/conf.d/lz4.ini
RUN echo extension=snappy.so >> /usr/local/etc/php/conf.d/snappy.ini
RUN echo extension=mongodb.so >> /usr/local/etc/php/conf.d/mongodb.ini

EXPOSE 80

Expand Down
3 changes: 3 additions & 0 deletions php-8.2/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,7 @@ fileExistenceTests:
shouldExist: true
- name: 'Check snappy extension'
path: /usr/local/lib/php/extensions/no-debug-non-zts-20220829/snappy.so
shouldExist: true
- name: 'Check mongodb extension'
path: /usr/local/lib/php/extensions/no-debug-non-zts-20220829/mongodb.so
shouldExist: true
Loading