Skip to content

Commit

Permalink
Merge pull request #2376 from tarlepp/chore(env)/php-update
Browse files Browse the repository at this point in the history
Chore(env) - PHP update
  • Loading branch information
tarlepp committed Aug 2, 2023
2 parents 01b123c + 96e317c commit 204dbdc
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 99 deletions.
172 changes: 81 additions & 91 deletions .idea/php.xml

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

6 changes: 3 additions & 3 deletions Dockerfile
@@ -1,4 +1,4 @@
FROM php:8.2.7-fpm
FROM php:8.2.8-fpm

ENV APP_ENV prod
ENV APP_DEBUG 0
Expand All @@ -18,7 +18,7 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*

# Copy the install-php-extensions (Easily install PHP extension in official PHP Docker containers)
COPY --from=mlocati/php-extension-installer:2.1.28 /usr/bin/install-php-extensions /usr/local/bin/
COPY --from=mlocati/php-extension-installer:2.1.37 /usr/bin/install-php-extensions /usr/local/bin/

# Install and enable all necessary PHP extensions
RUN install-php-extensions \
Expand All @@ -31,7 +31,7 @@ RUN install-php-extensions \
zip

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

# Enable Composer autocompletion
RUN composer completion bash > /etc/bash_completion.d/composer
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile_dev
@@ -1,4 +1,4 @@
FROM php:8.2.7-fpm
FROM php:8.2.8-fpm

# Let's use bash as a default shell with login each time
SHELL ["/bin/bash", "--login", "-c"]
Expand All @@ -10,7 +10,7 @@ ARG HOST_GID
# Declare constants
ENV PATH "$PATH:/home/dev/.composer/vendor/bin:/app/vendor/bin"
ENV NVM_VERSION v0.39.3
ENV NODE_VERSION 20.3.0
ENV NODE_VERSION 20.4.0

# Update package list and install necessary libraries
RUN apt-get update \
Expand Down Expand Up @@ -56,7 +56,7 @@ ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8

# Copy the install-php-extensions (Easily install PHP extension in official PHP Docker containers)
COPY --from=mlocati/php-extension-installer:2.1.28 /usr/bin/install-php-extensions /usr/local/bin/
COPY --from=mlocati/php-extension-installer:2.1.37 /usr/bin/install-php-extensions /usr/local/bin/

# Enable all necessary PHP packages
RUN install-php-extensions \
Expand All @@ -70,7 +70,7 @@ RUN install-php-extensions \
zip

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

# Enable Composer autocompletion
RUN composer completion bash > /etc/bash_completion.d/composer
Expand Down Expand Up @@ -119,7 +119,7 @@ RUN groupadd --gid ${HOST_GID} dev \

USER dev

RUN pip3 install thefuck --user
RUN pip3 install thefuck --user --break-system-packages

# Add necessary stuff to bash autocomplete
ENV PATH "$PATH:/home/dev/.local/bin"
Expand Down

0 comments on commit 204dbdc

Please sign in to comment.