Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Dockerfiles
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Picasoft
Technique
Dockerfiles
Commits
f59faffb
Commit
f59faffb
authored
7 years ago
by
PICHOU Kyâne
Committed by
PICHOU Kyâne
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix fpm on Nginx image
parent
d8371f03
No related branches found
Branches containing commit
No related tags found
1 merge request
!5
CheckMK stable image
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
pica-nginx/Dockerfile
+1
-1
1 addition, 1 deletion
pica-nginx/Dockerfile
pica-nginx/start.sh
+1
-1
1 addition, 1 deletion
pica-nginx/start.sh
pica-nginx/supervisord.conf
+1
-1
1 addition, 1 deletion
pica-nginx/supervisord.conf
with
3 additions
and
3 deletions
pica-nginx/Dockerfile
+
1
−
1
View file @
f59faffb
FROM
registry.picasoft.net:5000/pica-debian:latest
MAINTAINER
antoine@barbare.me
RUN
echo
"deb http://packages.dotdeb.org
jessie
all"
>
/etc/apt/sources.list.d/dotdeb.list
&&
\
RUN
echo
"deb http://packages.dotdeb.org
stretch
all"
>
/etc/apt/sources.list.d/dotdeb.list
&&
\
wget
-O-
https://www.dotdeb.org/dotdeb.gpg | apt-key add -
&&
\
apt-get update
-y
&&
apt-get
install
-y
php7.0 php7.0-fpm php7.0-gd php7.0-xml nginx supervisor curl
tar
...
...
This diff is collapsed.
Click to expand it.
pica-nginx/start.sh
+
1
−
1
View file @
f59faffb
...
...
@@ -3,5 +3,5 @@
set
-e
chown
-R
www-data /var/www
mkdir
-p
/var/run/php
exec
/usr/bin/supervisord
-c
/etc/supervisord.conf
This diff is collapsed.
Click to expand it.
pica-nginx/supervisord.conf
+
1
−
1
View file @
f59faffb
...
...
@@ -11,7 +11,7 @@ file=/var/run/supervisor.sock
supervisor
.
rpcinterface_factory
=
supervisor
.
rpcinterface
:
make_main_rpcinterface
[
program
:
php
]
command
=/
usr
/
sbin
/
php
-
fpm7
.
0
command
=/
usr
/
sbin
/
php
-
fpm7
.
0
-
F
stdout_logfile
=/
dev
/
stdout
stdout_logfile_maxbytes
=
0
redirect_stderr
=
true
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment