Skip to content

Commit

Permalink
Merge branch 'release/1.0.10'
Browse files Browse the repository at this point in the history
  • Loading branch information
khalwat committed Dec 2, 2020
2 parents e90940d + b2fd2c0 commit c84d1a7
Show file tree
Hide file tree
Showing 3 changed files with 34 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.0.10 - 2020.12.01
### Added
* Added `postgresql-client-12` to the postgres PHP containers to allow db backups to work

## 1.0.9 - 2020.11.25
### Changed
* Change `mysql-client` to `mariadb-client`
Expand Down
15 changes: 15 additions & 0 deletions php-dev-craft/postgres/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
FROM nystudio107/php-dev-base

# Install postgres repositories
RUN apt-get update \
&& \
# apt Debian packages
apt-get install -y \
lsb-release \
gnupg \
bash-completion \
wget \
&& \
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
&& \
echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list

# Install packages
RUN apt-get update \
&& \
Expand All @@ -10,6 +24,7 @@ RUN apt-get update \
optipng \
gifsicle \
webp \
postgresql-client-12 \
&& \
# Install PHP extensions
docker-php-ext-install \
Expand Down
15 changes: 15 additions & 0 deletions php-prod-craft/postgres/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
FROM nystudio107/php-prod-base

# Install postgres repositories
RUN apt-get update \
&& \
# apt Debian packages
apt-get install -y \
lsb-release \
gnupg \
bash-completion \
wget \
&& \
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
&& \
echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list

# Install packages
RUN apt-get update \
&& \
Expand All @@ -10,6 +24,7 @@ RUN apt-get update \
optipng \
gifsicle \
webp \
postgresql-client-12 \
&& \
# Install PHP extensions
docker-php-ext-install \
Expand Down

0 comments on commit c84d1a7

Please sign in to comment.