Skip to content

Commit

Permalink
Merge branch 'release/1.2.12'
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Welch committed May 23, 2021
2 parents 94673a6 + 896a756 commit 300eda8
Show file tree
Hide file tree
Showing 17 changed files with 52 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# nystudio107/docker-images Change Log

## 1.2.12 - 2021.05.23
### Changed
* Run php container as the `www-data` user to avoid permissions issues

## 1.2.11 - 2021.03.29
### Added
* Added support for webp to the GD PHP extension in `php-prod-base:8.0-alpine` & `php-prod-base:7.4-alpine`
Expand Down
3 changes: 3 additions & 0 deletions php-dev-craft/php-7.3/mariadb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@ RUN mkdir -p /var/www/project/cms/web/cpresources && \
chown -R www-data:www-data /var/www/project/cms/web/cpresources

WORKDIR /var/www/project/cms

# run container as the www-data user
USER www-data
3 changes: 3 additions & 0 deletions php-dev-craft/php-7.3/postgres/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,6 @@ RUN mkdir -p /var/www/project/cms/web/cpresources && \
chown -R www-data:www-data /var/www/project/cms/web/cpresources

WORKDIR /var/www/project/cms

# run container as the www-data user
USER www-data
3 changes: 3 additions & 0 deletions php-dev-craft/php-7.4-alpine/mariadb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,6 @@ RUN mkdir -p /var/www/project/cms/web/cpresources && \
chown -R www-data:www-data /var/www/project/cms/web/cpresources

WORKDIR /var/www/project/cms

# run container as the www-data user
USER www-data
3 changes: 3 additions & 0 deletions php-dev-craft/php-7.4-alpine/postgres/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,6 @@ RUN mkdir -p /var/www/project/cms/web/cpresources && \
chown -R www-data:www-data /var/www/project/cms/web/cpresources

WORKDIR /var/www/project/cms

# run container as the www-data user
USER www-data
3 changes: 3 additions & 0 deletions php-dev-craft/php-7.4/mariadb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@ RUN mkdir -p /var/www/project/cms/web/cpresources && \
chown -R www-data:www-data /var/www/project/cms/web/cpresources

WORKDIR /var/www/project/cms

# run container as the www-data user
USER www-data
3 changes: 3 additions & 0 deletions php-dev-craft/php-7.4/postgres/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,6 @@ RUN mkdir -p /var/www/project/cms/web/cpresources && \
chown -R www-data:www-data /var/www/project/cms/web/cpresources

WORKDIR /var/www/project/cms

# run container as the www-data user
USER www-data
3 changes: 3 additions & 0 deletions php-dev-craft/php-8.0-alpine/mariadb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,6 @@ RUN mkdir -p /var/www/project/cms/web/cpresources && \
chown -R www-data:www-data /var/www/project/cms/web/cpresources

WORKDIR /var/www/project/cms

# run container as the www-data user
USER www-data
3 changes: 3 additions & 0 deletions php-dev-craft/php-8.0-alpine/postgres/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,6 @@ RUN mkdir -p /var/www/project/cms/web/cpresources && \
chown -R www-data:www-data /var/www/project/cms/web/cpresources

WORKDIR /var/www/project/cms

# run container as the www-data user
USER www-data
3 changes: 3 additions & 0 deletions php-prod-craft/php-7.3/mariadb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ RUN mkdir -p /var/www/project/cms/web/cpresources && \

WORKDIR /var/www/project/cms

# run container as the www-data user
USER www-data

# Force permissions, update Craft, and start php-fpm

# Do a `composer install` without running any Composer scripts
Expand Down
3 changes: 3 additions & 0 deletions php-prod-craft/php-7.3/postgres/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ RUN mkdir -p /var/www/project/cms/web/cpresources && \

WORKDIR /var/www/project/cms

# run container as the www-data user
USER www-data

# Force permissions, update Craft, and start php-fpm

# Do a `composer install` without running any Composer scripts
Expand Down
3 changes: 3 additions & 0 deletions php-prod-craft/php-7.4-alpine/mariadb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ RUN chown -R www-data:www-data /var/www/project/cms/web

WORKDIR /var/www/project/cms

# run container as the www-data user
USER www-data

# Force permissions, update Craft, and start php-fpm

# Do a `composer install` without running any Composer scripts
Expand Down
3 changes: 3 additions & 0 deletions php-prod-craft/php-7.4-alpine/postgres/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ RUN chown -R www-data:www-data /var/www/project/cms/web

WORKDIR /var/www/project/cms

# run container as the www-data user
USER www-data

# Force permissions, update Craft, and start php-fpm

# Do a `composer install` without running any Composer scripts
Expand Down
3 changes: 3 additions & 0 deletions php-prod-craft/php-7.4/mariadb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ RUN mkdir -p /var/www/project/cms/web/cpresources && \

WORKDIR /var/www/project/cms

# run container as the www-data user
USER www-data

# Force permissions, update Craft, and start php-fpm

# Do a `composer install` without running any Composer scripts
Expand Down
3 changes: 3 additions & 0 deletions php-prod-craft/php-7.4/postgres/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ RUN apt-get update \

WORKDIR /var/www/project

# run container as the www-data user
USER www-data

COPY ./run_queue.sh .
RUN chmod a+x run_queue.sh

Expand Down
3 changes: 3 additions & 0 deletions php-prod-craft/php-8.0-alpine/mariadb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ RUN chown -R www-data:www-data /var/www/project/cms/web

WORKDIR /var/www/project/cms

# run container as the www-data user
USER www-data

# Force permissions, update Craft, and start php-fpm

# Do a `composer install` without running any Composer scripts
Expand Down
3 changes: 3 additions & 0 deletions php-prod-craft/php-8.0-alpine/postgres/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ RUN chown -R www-data:www-data /var/www/project/cms/web

WORKDIR /var/www/project/cms

# run container as the www-data user
USER www-data

# Force permissions, update Craft, and start php-fpm

# Do a `composer install` without running any Composer scripts
Expand Down

0 comments on commit 300eda8

Please sign in to comment.