Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
compose.libre.sh
Manage
Activity
Members
Labels
Plan
Issues
1
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
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
Show more breadcrumbs
ecobytes
compose.libre.sh
Commits
e35e0fc1
Commit
e35e0fc1
authored
10 years ago
by
Pierre Ozoux
Browse files
Options
Downloads
Patches
Plain Diff
Adds ssmtp to nginx-php, closes
#40
parent
edaa552f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dockerfiles/services/nginx-php/Dockerfile
+4
-0
4 additions, 0 deletions
dockerfiles/services/nginx-php/Dockerfile
dockerfiles/services/nginx-php/ssmtp.conf
+4
-0
4 additions, 0 deletions
dockerfiles/services/nginx-php/ssmtp.conf
with
8 additions
and
0 deletions
dockerfiles/services/nginx-php/Dockerfile
+
4
−
0
View file @
e35e0fc1
...
...
@@ -6,6 +6,7 @@ RUN apt-get update && apt-get install -y \
mysql-client
\
php5-fpm
\
php5-mysql
\
ssmtp
\
curl
&&
\
rm
-rf
/var/lib/apt/lists/
*
&&
\
rm
-rf
/etc/nginx/conf.d/
*
&&
\
...
...
@@ -14,6 +15,7 @@ RUN apt-get update && apt-get install -y \
sed
-i
's/access_log.*/access_log \/dev\/stdout;/g'
/etc/nginx/nginx.conf
&&
\
sed
-i
's/error_log.*/error_log \/dev\/stdout info;/g'
/etc/nginx/nginx.conf
&&
\
sed
-i
's/^pid/daemon off;\npid/g'
/etc/nginx/nginx.conf
&&
\
sed
-i
"s/.*sendmail_path.*/sendmail_path =
\/
usr
\/
sbin
\/
ssmtp -t/g"
/etc/php5/fpm/php.ini
&&
\
sed
-i
's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g'
/etc/php5/fpm/php.ini
ADD
basic.conf /etc/nginx/conf.d/basic.conf
...
...
@@ -23,6 +25,8 @@ RUN chmod u+x /opt/entrypoint.sh
ADD
mysql-check.sh /opt/mysql-check.sh
RUN
chmod
u+x /opt/mysql-check.sh
COPY
ssmtp.conf /etc/ssmtp/ssmtp.conf
ADD
environment /etc/environment
ENTRYPOINT
["/opt/entrypoint.sh"]
...
...
This diff is collapsed.
Click to expand it.
dockerfiles/services/nginx-php/ssmtp.conf
0 → 100644
+
4
−
0
View file @
e35e0fc1
mailhub
=
172
.
17
.
42
.
1
root
=
postmaster
FromLineOverride
=
YES
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