Skip to content

Commit

Permalink
revert to just base-php tag
Browse files Browse the repository at this point in the history
we will no longer attempt further PHP upgrades.  Staying at PHP 7.4
  • Loading branch information
megahirt committed May 16, 2024
1 parent 28f3449 commit 8155367
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions docker/app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -47,15 +47,15 @@ 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
# had to add /wait into prod image so the prod image could be run through E2E tests.
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
Expand Down
2 changes: 1 addition & 1 deletion docker/test-php/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM sillsdev/web-languageforge:base-php-7.4
FROM sillsdev/web-languageforge:base-php


# ----- LINES BELOW COPIED FROM APP DOCKERFILE ----------
Expand Down

0 comments on commit 8155367

Please sign in to comment.