Skip to content

Commit

Permalink
➕ Add postgres
Browse files Browse the repository at this point in the history
  • Loading branch information
llaumgui committed Sep 13, 2024
1 parent e752e29 commit a89bad9
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/devops.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
with:
fetch-depth: 0
- name: Use markdownlint-cli2
uses: DavidAnson/markdownlint-cli2-action@v16
uses: DavidAnson/markdownlint-cli2-action@v17
with:
config: .markdownlint.yaml
- name: Use editorconfig-checker
Expand Down
5 changes: 5 additions & 0 deletions 8.2-nextcloud/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,13 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
bzip2 \
curl \
ffmpeg \
git \
libfcgi-bin \
libldap-common \
libmagickwand-6.q16-6 \
libmagickcore-6.q16-6-extra \
libpng16-16 \
libpq5 \
libzip4 \
procps \
unzip \
Expand Down Expand Up @@ -87,6 +89,8 @@ RUN fetchDeps=" \
libldap2-dev \
# Build dependency for mbstring \
libonig-dev\
# Build dependancies for PostgreSQL \
libpq-dev \
# Build dependencies for XML part \
libxml2-dev \
# Build dependencies for Zip \
Expand Down Expand Up @@ -119,6 +123,7 @@ RUN fetchDeps=" \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
shmop \
soap \
sysvsem \
Expand Down
7 changes: 7 additions & 0 deletions 8.2-nextcloud/php.d/nextcloud-postgres-recommended.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[PostgreSQL]
pgsql.allow_persistent = On
pgsql.auto_reset_persistent = Off
pgsql.max_persistent = -1
pgsql.max_links = -1
pgsql.ignore_notice = 0
pgsql.log_notice = 0
9 changes: 6 additions & 3 deletions 8.2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ RUN apk add --update --no-cache \
freetype-dev \
libjpeg-turbo-dev \
libpng-dev \
# Dependancy for gmp \
gmp \
libgmpxx \
# Dependancy for intl \
icu-libs \
libintl \
Expand Down Expand Up @@ -240,11 +243,11 @@ RUN if [ "${DOCKER_PHP_ENABLE_POSTGRESQL}" != "off" ]; then \
libpq && \
# Build dependancies for PostgreSQL \
apk add --update --no-cache --virtual .docker-php-postgresql-dependancies \
postgresql-client \
postgresql-dev && \
libpq-dev && \
docker-php-ext-configure pdo_pgsql && \
docker-php-ext-configure pgsql && \
docker-php-ext-install pdo_pgsql \
docker-php-ext-install \
pdo_pgsql \
pgsql && \
apk del .docker-php-postgresql-dependancies && \
php -m; \
Expand Down
4 changes: 4 additions & 0 deletions 8.3-nextcloud/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
libmagickwand-6.q16-6 \
libmagickcore-6.q16-6-extra \
libpng16-16 \
libpq5 \
libzip4 \
procps \
unzip \
Expand Down Expand Up @@ -88,6 +89,8 @@ RUN fetchDeps=" \
libldap2-dev \
# Build dependency for mbstring \
libonig-dev\
# Build dependancies for PostgreSQL \
libpq-dev \
# Build dependencies for XML part \
libxml2-dev \
# Build dependencies for Zip \
Expand Down Expand Up @@ -120,6 +123,7 @@ RUN fetchDeps=" \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
shmop \
soap \
sysvsem \
Expand Down
7 changes: 7 additions & 0 deletions 8.3-nextcloud/php.d/nextcloud-postgres-recommended.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[PostgreSQL]
pgsql.allow_persistent = On
pgsql.auto_reset_persistent = Off
pgsql.max_persistent = -1
pgsql.max_links = -1
pgsql.ignore_notice = 0
pgsql.log_notice = 0
6 changes: 3 additions & 3 deletions 8.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,11 @@ RUN if [ "${DOCKER_PHP_ENABLE_POSTGRESQL}" != "off" ]; then \
libpq && \
# Build dependancies for PostgreSQL \
apk add --update --no-cache --virtual .docker-php-postgresql-dependancies \
postgresql-client \
postgresql-dev && \
libpq-dev && \
docker-php-ext-configure pdo_pgsql && \
docker-php-ext-configure pgsql && \
docker-php-ext-install pdo_pgsql \
docker-php-ext-install \
pdo_pgsql \
pgsql && \
apk del .docker-php-postgresql-dependancies && \
php -m; \
Expand Down

0 comments on commit a89bad9

Please sign in to comment.