Skip to content

Commit 6357723

Browse files
committed
Merge branch 'master' into tune_nginx_processes
2 parents 5af154b + e18825d commit 6357723

115 files changed

Lines changed: 27 additions & 12 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci-cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
strategy:
1010
matrix:
11-
version: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
11+
version: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
1212
type: ['', '-prod']
1313

1414
steps:

7.1-nginx-prod/Dockerfile

100644100755
File mode changed.

7.1-nginx-prod/default.tmpl

100644100755
File mode changed.

7.1-nginx-prod/entrypoint

100644100755
File mode changed.

7.1-nginx-prod/supervisor.conf

100644100755
File mode changed.

7.1-nginx/Dockerfile

100644100755
File mode changed.

7.1-nginx/default.tmpl

100644100755
File mode changed.

7.1-nginx/entrypoint

100644100755
File mode changed.

7.1-nginx/supervisor.conf

100644100755
File mode changed.

7.1-prod/Dockerfile

100644100755
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN adduser -D -u 1337 kool \
3333
icu-dev libedit-dev libxml2-dev \
3434
imagemagick-dev openldap-dev \
3535
postgresql-dev \
36+
linux-headers \
3637
# php-ext
3738
&& docker-php-ext-configure gd \
3839
--with-freetype-dir=/usr/include/ \

0 commit comments

Comments
 (0)