diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile index 8125b287fc..ac191ffa9a 100644 --- a/docker/app/Dockerfile +++ b/docker/app/Dockerfile @@ -38,7 +38,7 @@ RUN npm run build:${NPM_BUILD_SUFFIX} # COMPOSER-BUILDER # download composer app dependencies # git - needed for composer install -FROM sillsdev/web-languageforge:base-php-7.4 AS composer-builder +FROM sillsdev/web-languageforge:base-php AS composer-builder ENV COMPOSER_ALLOW_SUPERUSER=1 RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/* \ && install-php-extensions @composer @@ -47,7 +47,7 @@ COPY src/composer.json src/composer.lock /composer/ RUN composer install # PRODUCTION IMAGE -FROM sillsdev/web-languageforge:base-php-7.4 AS production-app +FROM sillsdev/web-languageforge:base-php AS production-app RUN rm /usr/local/bin/install-php-extensions RUN apt-get remove -y gnupg2 RUN mv $PHP_INI_DIR/php.ini-production $PHP_INI_DIR/php.ini @@ -55,7 +55,7 @@ RUN mv $PHP_INI_DIR/php.ini-production $PHP_INI_DIR/php.ini COPY --from=sillsdev/web-languageforge:wait-latest /wait /wait # DEVELOPMENT IMAGE -FROM sillsdev/web-languageforge:base-php-7.4 AS development-app +FROM sillsdev/web-languageforge:base-php AS development-app RUN install-php-extensions xdebug-^3.1 COPY docker/app/docker-php-ext-xdebug.ini /usr/local/etc/php/conf.d RUN mv $PHP_INI_DIR/php.ini-development $PHP_INI_DIR/php.ini diff --git a/docker/test-php/Dockerfile b/docker/test-php/Dockerfile index b93f83d233..8ef5761810 100644 --- a/docker/test-php/Dockerfile +++ b/docker/test-php/Dockerfile @@ -1,4 +1,4 @@ -FROM sillsdev/web-languageforge:base-php-7.4 +FROM sillsdev/web-languageforge:base-php # ----- LINES BELOW COPIED FROM APP DOCKERFILE ----------