Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Platform
Commits
cb0df013
Unverified
Commit
cb0df013
authored
Sep 10, 2017
by
Nicolas Widart
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use minimum php version by default
parent
d6dca69e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
19 deletions
+19
-19
Dockerfile
docker/app/Dockerfile
+15
-15
default
docker/app/default
+1
-1
php-fpm.conf
docker/app/php-fpm.conf
+2
-2
supervisord.conf
docker/app/supervisord.conf
+1
-1
No files found.
docker/app/Dockerfile
View file @
cb0df013
...
@@ -16,19 +16,19 @@ RUN add-apt-repository ppa:nginx/stable \
...
@@ -16,19 +16,19 @@ RUN add-apt-repository ppa:nginx/stable \
&&
apt-get update
\
&&
apt-get update
\
&&
apt-get
install
--no-install-recommends
-y
\
&&
apt-get
install
--no-install-recommends
-y
\
nginx
\
nginx
\
php7.
1
-fpm
\
php7.
0
-fpm
\
php7.
1
-cli
\
php7.
0
-cli
\
php7.
1
-xdebug
\
php7.
0
-xdebug
\
php7.
1
-pdo
\
php7.
0
-pdo
\
php7.
1
-pdo-mysql
\
php7.
0
-pdo-mysql
\
php7.
1
-sqlite3
\
php7.
0
-sqlite3
\
php7.
1
-xml
\
php7.
0
-xml
\
php7.
1
-mbstring
\
php7.
0
-mbstring
\
php7.
1
-tokenizer
\
php7.
0
-tokenizer
\
php7.
1
-zip
\
php7.
0
-zip
\
php7.
1
-mcrypt
\
php7.
0
-mcrypt
\
php7.
1
-gd
\
php7.
0
-gd
\
php7.
1
-curl
\
php7.
0
-curl
\
curl
\
curl
\
&&
mkdir
/run/php
\
&&
mkdir
/run/php
\
&&
curl
-sS
https://getcomposer.org/installer | php
--
--install-dir
=
/usr/local/bin
--filename
=
composer
\
&&
curl
-sS
https://getcomposer.org/installer | php
--
--install-dir
=
/usr/local/bin
--filename
=
composer
\
...
@@ -38,7 +38,7 @@ RUN add-apt-repository ppa:nginx/stable \
...
@@ -38,7 +38,7 @@ RUN add-apt-repository ppa:nginx/stable \
&&
rm
-rf
/var/lib/apt/lists/
*
/tmp/
*
/var/tmp/
*
&&
rm
-rf
/var/lib/apt/lists/
*
/tmp/
*
/var/tmp/
*
COPY
default /etc/nginx/sites-enabled/default
COPY
default /etc/nginx/sites-enabled/default
COPY
php-fpm.conf /etc/php/7.
1
/fpm/php-fpm.conf
COPY
php-fpm.conf /etc/php/7.
0
/fpm/php-fpm.conf
COPY
supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY
supervisord.conf /etc/supervisor/conf.d/supervisord.conf
RUN
mkdir
/tmp/certgen
RUN
mkdir
/tmp/certgen
...
@@ -57,4 +57,4 @@ RUN openssl genrsa -des3 -passout pass:x -out server.pass.key 2048 \
...
@@ -57,4 +57,4 @@ RUN openssl genrsa -des3 -passout pass:x -out server.pass.key 2048 \
EXPOSE
80
EXPOSE
80
EXPOSE
443
EXPOSE
443
CMD
["supervisord"]
CMD
["supervisord"]
\ No newline at end of file
docker/app/default
View file @
cb0df013
...
@@ -25,7 +25,7 @@ server {
...
@@ -25,7 +25,7 @@ server {
}
}
location ~ \.php$ {
location ~ \.php$ {
include snippets/fastcgi-php.conf;
include snippets/fastcgi-php.conf;
fastcgi_pass unix:/run/php/php7.
1
-fpm.sock;
fastcgi_pass unix:/run/php/php7.
0
-fpm.sock;
}
}
location ~ /\.ht {
location ~ /\.ht {
deny all;
deny all;
...
...
docker/app/php-fpm.conf
View file @
cb0df013
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
;
Pid
file
;
Pid
file
;
Note
:
the
default
prefix
is
/
var
;
Note
:
the
default
prefix
is
/
var
;
Default
Value
:
none
;
Default
Value
:
none
pid
= /
run
/
php
/
php7
.
1
-
fpm
.
pid
pid
= /
run
/
php
/
php7
.
0
-
fpm
.
pid
;
Error
log
file
;
Error
log
file
;
If
it
'
s
set
to
"syslog"
,
log
is
sent
to
syslogd
instead
of
being
written
;
If
it
'
s
set
to
"syslog"
,
log
is
sent
to
syslogd
instead
of
being
written
...
@@ -122,4 +122,4 @@ daemonize = no
...
@@ -122,4 +122,4 @@ daemonize = no
;
Relative
path
can
also
be
used
.
They
will
be
prefixed
by
:
;
Relative
path
can
also
be
used
.
They
will
be
prefixed
by
:
; -
the
global
prefix
if
it
'
s
been
set
(-
p
argument
)
; -
the
global
prefix
if
it
'
s
been
set
(-
p
argument
)
; - /
usr
otherwise
; - /
usr
otherwise
include
=/
etc
/
php
/
7
.
1
/
fpm
/
pool
.
d
/*.
conf
include
=/
etc
/
php
/
7
.
0
/
fpm
/
pool
.
d
/*.
conf
\ No newline at end of file
docker/app/supervisord.conf
View file @
cb0df013
...
@@ -9,7 +9,7 @@ stderr_logfile=/dev/stderr
...
@@ -9,7 +9,7 @@ stderr_logfile=/dev/stderr
stderr_logfile_maxbytes
=
0
stderr_logfile_maxbytes
=
0
[
program
:
php
-
fpm
]
[
program
:
php
-
fpm
]
command
=
php
-
fpm7
.
1
command
=
php
-
fpm7
.
0
stdout_logfile
=/
dev
/
stdout
stdout_logfile
=/
dev
/
stdout
stdout_logfile_maxbytes
=
0
stdout_logfile_maxbytes
=
0
stderr_logfile
=/
dev
/
stderr
stderr_logfile
=/
dev
/
stderr
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment