Skip to content

Commit

Permalink
Merge pull request #1381 from tarlepp/chore(env)/php-update
Browse files Browse the repository at this point in the history
Chore(env)/PHP upgrade
  • Loading branch information
tarlepp committed Aug 31, 2021
2 parents ae32e28 + 1af57cb commit 8fb73bb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .idea/php.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Dockerfile
@@ -1,4 +1,4 @@
FROM php:8.0.9-fpm
FROM php:8.0.10-fpm

RUN apt-get update && apt-get install -y \
zlib1g-dev libzip-dev libxml2-dev libicu-dev g++ git unzip jq wget \
Expand All @@ -20,7 +20,7 @@ RUN pickle install apcu \
&& docker-php-ext-enable apcu --ini-name 10-docker-php-ext-apcu.ini

# Copy the Composer PHAR from the Composer image into the PHP image
COPY --from=composer:2.1.5 /usr/bin/composer /usr/bin/composer
COPY --from=composer:2.1.6 /usr/bin/composer /usr/bin/composer

ENV APP_ENV prod
ENV APP_DEBUG 0
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile_dev
@@ -1,4 +1,4 @@
FROM php:8.0.9-fpm
FROM php:8.0.10-fpm

# Let's use bash as a default shell with login each time
SHELL ["/bin/bash", "--login", "-c"]
Expand All @@ -9,7 +9,7 @@ ARG HOST_GID

# Declare constants
ENV PATH "$PATH:/home/dev/.composer/vendor/bin:/app/vendor/bin:/app/bin"
ENV NVM_VERSION v0.35.3
ENV NVM_VERSION v0.38.0
ENV NODE_VERSION 16

# Update package list and install necessary libraries
Expand All @@ -36,7 +36,7 @@ RUN pickle install apcu \
&& docker-php-ext-enable apcu --ini-name 10-docker-php-ext-apcu.ini

# Copy the Composer PHAR from the Composer image into the PHP image
COPY --from=composer:2.1.5 /usr/bin/composer /usr/bin/composer
COPY --from=composer:2.1.6 /usr/bin/composer /usr/bin/composer

# Copy development `php.ini` configuration to container
COPY ./docker/php/php-dev.ini /usr/local/etc/php/php.ini
Expand Down

0 comments on commit 8fb73bb

Please sign in to comment.