Merge branch 'main' into feat-add-postgres-driver

Author: PineappleIOnic

.github/workflows/build-and-push.yml

@@ -0,0 +1,37 @@
+name: Build and Push to DockerHub
+
+on:
+  release:
+    types: [published]
+
+env:
+  REGISTRY: docker.io
+  IMAGE_NAME: appwrite/base
+  TAG: ${{ github.event.release.tag_name }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@v3
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG }}

.travis.yml

@@ -1,4 +1,3 @@
-
 dist: focal
 
 arch:
@@ -33,13 +32,3 @@ install:
 
 script:
   - container-structure-test test --image appwrite-base-test --config tests.yaml
-
-deploy:
-  - provider: script
-    edge: true
-    script: docker run --privileged --rm tonistiigi/binfmt --install all &&
-      docker buildx create --use &&
-      docker buildx build --platform linux/amd64,linux/arm64/v8 -t appwrite/base:$TRAVIS_TAG ./ --push
-    on:
-      tags: true
-      condition: "$TRAVIS_CPU_ARCH = amd64"

Dockerfile

@@ -6,7 +6,7 @@ ENV PHP_REDIS_VERSION=5.3.7 \
     PHP_IMAGICK_VERSION=3.7.0 \
     PHP_YAML_VERSION=2.2.2 \
     PHP_MAXMINDDB_VERSION=v1.11.0 \
-    PHP_SCRYPT_COMMIT_SHA="af0378533cbde920aa1985405c12423577685c5d" \
+    PHP_SCRYPT_COMMIT_SHA="9a8e615cb210d8564213be90a229c95c07c3f20a" \
     PHP_ZSTD_VERSION="4504e4186e79b197cfcb75d4d09aa47ef7d92fe9" \
     PHP_BROTLI_VERSION="7ae4fcd8b81a65d7521c298cae49af386d1ea4e3" \
     PHP_SNAPPY_VERSION="bfefe4906e0abb1f6cc19005b35f9af5240d9025" \
@@ -21,7 +21,6 @@ RUN \
   g++ \
   git \
   zlib-dev \
-  brotli-dev \
   openssl-dev \
   yaml-dev \
   imagemagick \
@@ -139,15 +138,13 @@ RUN git clone --recursive https://github.com/kjdev/php-ext-snappy.git \
 ## Scrypt Extension
 FROM compile AS scrypt
 RUN \
-  git clone --depth 1 --branch master https://github.com/DomBlack/php-scrypt.git && \
+  git clone --depth 1 https://github.com/DomBlack/php-scrypt.git && \
   cd php-scrypt && \
-  git reset --hard $PHP_SCRYPT_COMMIT_SHA && \
+  git checkout $PHP_SCRYPT_COMMIT_SHA && \
   phpize && \
   ./configure --enable-scrypt && \
   make && make install
 
-
-
 FROM php:8.0.18-cli-alpine3.15 as final
 
 LABEL maintainer="team@appwrite.io"
@@ -172,8 +169,9 @@ RUN \
   curl-dev \
   && apk add --no-cache \
   libstdc++ \
-  certbot \
+  rsync \
   brotli-dev \
+  lz4-dev \
   yaml-dev \
   imagemagick \
   imagemagick-dev \

tests.yaml

@@ -108,6 +108,10 @@ commandTests:
     command: "magick"
     args: ["--version"]
     expectedOutput: [".*ImageMagick 7.1.0-16.*"]
+  - name: 'rsync command'
+    command: "rsync"
+    args: ["--version"]
+    expectedOutput: ["rsync  version 3.*"]
   - name: 'Certbot command'
     command: "certbot"
     args: ["--version"]