Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
R
release_engineering
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhanhua kuang
release_engineering
Commits
4e7aafb3
Commit
4e7aafb3
authored
Mar 02, 2020
by
zhanhua kuang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rebase nginx to mount cert files
parent
c9727667
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
10 deletions
+20
-10
docker-compose.yml
docker-compose.yml
+6
-4
nginx.conf
nginx.conf
+10
-6
Dockerfile
nginx/Dockerfile
+4
-0
No files found.
docker-compose.yml
View file @
4e7aafb3
...
@@ -71,18 +71,20 @@ services:
...
@@ -71,18 +71,20 @@ services:
networks
:
networks
:
-
ego
-
ego
nginx
:
nginx
:
image
:
nginx:latest
build
:
./nginx
image
:
gzego/nginx:latest
container_name
:
ego-nginx
container_name
:
ego-nginx
volumes
:
volumes
:
-
./www:/usr/share/nginx/html:ro
-
./www:/usr/share/nginx/html:ro
-
./nginx.conf:/etc/nginx/nginx.conf:ro
-
./nginx.conf:/etc/nginx/nginx.conf:ro
-
./certifications:/etc/nginx/cert:ro
links
:
links
:
-
carbinet_production:carbinet
-
carbinet_production:carbinet
-
sso_production:sso
-
sso_production:sso
networks
:
networks
:
-
ego
-
ego
ports
:
ports
:
-
"
8080:80
"
-
"
443:443
"
networks
:
networks
:
ego
:
ego
:
...
@@ -90,4 +92,5 @@ networks:
...
@@ -90,4 +92,5 @@ networks:
volumes
:
volumes
:
www
:
www
:
nginx.conf
:
nginx.conf
:
\ No newline at end of file
certifications
:
nginx.conf
View file @
4e7aafb3
...
@@ -43,11 +43,14 @@ http {
...
@@ -43,11 +43,14 @@ http {
server
{
server
{
# use 'listen 80 deferred;' for Linux
# use 'listen 80 deferred;' for Linux
# use 'listen 80 accept_filter=httpready;' for FreeBSD
# use 'listen 80 accept_filter=httpready;' for FreeBSD
listen
80
;
listen
443
;
client_max_body_size
4G
;
client_max_body_size
4G
;
# ssl_certificate /etc/nginx/cert/sso.gzncloud.com_chain.crt;
# ssl_certificate_key /etc/nginx/cert/sso.gzncloud.com.key;
# set the correct host(s) for your site
# set the correct host(s) for your site
server_name
sso.gz
ego
.com
;
server_name
sso.gz
ncloud
.com
;
keepalive_timeout
5
;
keepalive_timeout
5
;
# path for static files
# path for static files
...
@@ -76,9 +79,11 @@ http {
...
@@ -76,9 +79,11 @@ http {
}
}
server
{
server
{
listen
80
;
listen
443
;
server_name
carbinet.gzego
.com
;
server_name
ziti.gzncloud
.com
;
# ssl_certificate /etc/nginx/cert/ziti.gzncloud.com.pem;
# ssl_certificate_key /etc/nginx/cert/ziti.gzncloud.com.key;
#charset koi8-r;
#charset koi8-r;
#access_log /var/log/nginx/host.access.log main;
#access_log /var/log/nginx/host.access.log main;
root
/usr/share/nginx/html/carbinet
;
root
/usr/share/nginx/html/carbinet
;
...
@@ -134,4 +139,4 @@ http {
...
@@ -134,4 +139,4 @@ http {
# deny all;
# deny all;
#}
#}
}
}
}
}
\ No newline at end of file
nginx/Dockerfile
0 → 100644
View file @
4e7aafb3
FROM
nginx:latest
RUN
mkdir
-p
/etc/nginx/cert
VOLUME
["/etc/nginx/cert"]
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