diff --git a/Dockerfile b/Dockerfile index 69de236a52..ea39e616f6 100755 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \ --no-plugins --no-scripts --prefer-dist \ `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi` -FROM appwrite/base:1.4.4 AS base +FROM appwrite/base:2.0.0 AS base LABEL maintainer="team@appwrite.io" @@ -23,12 +23,7 @@ ENV DEBUG=$DEBUG ENV _APP_VERSION=$VERSION \ _APP_HOME=https://appwrite.io -RUN \ - if [ "$DEBUG" != "true" ]; then \ - rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \ - rm -f /usr/local/lib/php/extensions/no-debug-non-zts-*/xdebug.so; \ - fi && \ - if [ "$DEBUG" == "true" ]; then \ +RUN if [ "$DEBUG" == "true" ]; then \ apk add boost boost-dev; \ fi @@ -107,8 +102,6 @@ RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/ FROM base AS production RUN rm -rf /usr/src/code/app/config/specs && \ - rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini && \ - rm -f /usr/local/lib/php/extensions/no-debug-non-zts-*/xdebug.so && \ find /usr -name '*.a' -delete 2>/dev/null || true && \ find /usr -type d -name '__pycache__' -exec rm -rf {} + 2>/dev/null || true && \ find /usr -name '*.pyc' -delete 2>/dev/null || true @@ -117,12 +110,20 @@ EXPOSE 80 CMD [ "php", "app/http.php" ] +FROM appwrite/base:2.0.0-xdebug AS xdebug + FROM base AS development COPY ./docs /usr/src/code/docs COPY ./dev /usr/src/code/dev -RUN if [ "$DEBUG" = "true" ]; then \ +# appwrite/base:2.0.0 ships without XDebug, so it cannot reach production or +# Cloud. The -xdebug tag is the same build with the extension; mounting it +# rather than copying keeps xdebug.so out of every layer unless DEBUG asked +# for it, and guarantees an ABI match because both tags are one base build. +RUN --mount=from=xdebug,source=/usr/local/lib/php/extensions,target=/tmp/extensions \ + if [ "$DEBUG" = "true" ]; then \ + cp /tmp/extensions/no-debug-non-zts-*/xdebug.so "$(php-config --extension-dir)/" && \ cp /usr/src/code/dev/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini && \ mkdir -p /tmp/xdebug && \ apk add --update --no-cache openssh-client github-cli; \ diff --git a/docs/tutorials/multi-architecture-support.md b/docs/tutorials/multi-architecture-support.md index ce71f4e6e0..18c30c068d 100644 --- a/docs/tutorials/multi-architecture-support.md +++ b/docs/tutorials/multi-architecture-support.md @@ -6,7 +6,7 @@ CPU architecture support for Docker images used by the Appwrite stack. Platforms |---|---|---|---|---|---|---|---| | **Core** | | | | | | | | | appwrite/appwrite | 🟢 | 🟢 | 🔴 | 🔴 | 🟢 | 🔴 | 🔴 | -| appwrite/base:1.4.4 | 🟢 | 🟢 | 🔴 | 🔴 | 🟢 | 🔴 | 🔴 | +| appwrite/base:2.0.0 | 🟢 | 🟢 | 🔴 | 🔴 | 🟢 | 🔴 | 🔴 | | appwrite/assistant:0.8.4 | 🟢 | 🟢 | 🔴 | 🔴 | 🟢 | 🔴 | 🔴 | | appwrite/browser:0.3.3 | 🟢 | 🟢 | 🔴 | 🔴 | 🟢 | 🔴 | 🔴 | | appwrite/embedding:0.1.0 | 🟢 | 🟢 | 🔴 | 🔴 | 🟢 | 🔴 | 🔴 |