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
bf9846e3
Commit
bf9846e3
authored
Jul 23, 2017
by
Julien Tant
Committed by
Nicolas Widart
Jul 23, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add https to app docker image (#354)
parent
55c60b20
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
1 deletion
+20
-1
docker-compose.yml
docker-compose.yml
+1
-0
Dockerfile
docker/app/Dockerfile
+13
-0
default
docker/app/default
+6
-1
No files found.
docker-compose.yml
View file @
bf9846e3
...
...
@@ -6,6 +6,7 @@ services:
image
:
asgardcms/app:latest
ports
:
-
80:80
-
443:443
volumes
:
-
.:/var/www/html:cached
networks
:
...
...
docker/app/Dockerfile
View file @
bf9846e3
...
...
@@ -41,7 +41,20 @@ COPY default /etc/nginx/sites-enabled/default
COPY
php-fpm.conf /etc/php/7.1/fpm/php-fpm.conf
COPY
supervisord.conf /etc/supervisor/conf.d/supervisord.conf
RUN
mkdir
/tmp/certgen
WORKDIR
/tmp/certgen
RUN
openssl genrsa
-des3
-passout
pass:x
-out
server.pass.key 2048
\
&&
openssl rsa
-passin
pass:x
-in
server.pass.key
-out
server.key
\
&&
rm
server.pass.key
\
&&
openssl req
-new
-key
server.key
-out
server.csr
-subj
"/CN=asgardcms.com"
\
&&
openssl x509
-req
-days
365
-in
server.csr
-signkey
server.key
-out
server.crt
\
&&
cp
server.crt /etc/ssl/certs/
\
&&
cp
server.key /etc/ssl/private/
\
&&
rm
-rf
/tmp/certgen
EXPOSE
80
EXPOSE
443
CMD
["supervisord"]
\ No newline at end of file
docker/app/default
View file @
bf9846e3
...
...
@@ -2,9 +2,14 @@ server {
error_log /dev/stdout info;
access_log /dev/stdout;
listen 80
default_server
;
listen 80;
listen [::]:80 default_server ipv6only=on;
listen 443 ssl;
ssl_certificate /etc/ssl/certs/server.crt;
ssl_certificate_key /etc/ssl/private/server.key;
root /var/www/html/public;
index index.php index.html index.htm;
...
...
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