Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
RECIRCLE
/
portal
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
11
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
8ac6e4d4
authored
5 years ago
by
Chif Gergő
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix volume name in docker-compose prod, and typo in nginx conf
parent
c92b8619
Pipeline
#1323
canceled with stages
in 0 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
config/nginx/recircle.conf
+7
-7
docker-compose.prod.yml
+2
-2
No files found.
config/nginx/recircle.conf
View file @
8ac6e4d4
...
@@ -7,7 +7,7 @@ upstream wsbackend {
...
@@ -7,7 +7,7 @@ upstream wsbackend {
}
}
upstream
frontend
{
upstream
frontend
{
server
frontend
:
80
server
frontend
:
80
;
}
}
server
{
server
{
...
@@ -36,12 +36,12 @@ server {
...
@@ -36,12 +36,12 @@ server {
}
}
location
/
ws
/ {
location
/
ws
/ {
proxy_pass
http
://
wsbackend
;
proxy_pass
http
://
wsbackend
;
proxy_http_version
1
.
1
;
proxy_http_version
1
.
1
;
proxy_set_header
Upgrade
$
http_upgrade
;
proxy_set_header
Upgrade
$
http_upgrade
;
proxy_set_header
Connection
"Upgrade"
;
proxy_set_header
Connection
"Upgrade"
;
proxy_set_header
Host
$
host
;
proxy_set_header
Host
$
host
;
}
}
location
/
staticfiles
/ {
location
/
staticfiles
/ {
...
...
This diff is collapsed.
Click to expand it.
docker-compose.prod.yml
View file @
8ac6e4d4
...
@@ -7,7 +7,7 @@ services:
...
@@ -7,7 +7,7 @@ services:
ports
:
ports
:
-
"
80:80"
-
"
80:80"
volumes
:
volumes
:
-
"
/static
:/static
"
-
"
/static
files:/staticfiles
"
networks
:
networks
:
-
backend
-
backend
restart
:
on-failure
restart
:
on-failure
...
@@ -39,7 +39,7 @@ services:
...
@@ -39,7 +39,7 @@ services:
expose
:
expose
:
-
"
8000"
-
"
8000"
volumes
:
volumes
:
-
"
/static
:/static
"
-
"
/static
files:/staticfiles
"
depends_on
:
depends_on
:
-
db
-
db
...
...
This diff is collapsed.
Click to expand it.
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