Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scheduling-system
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
SMASCH
scheduling-system
Commits
7a1c9ee2
Commit
7a1c9ee2
authored
4 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
change port to 8888
parent
7a843f8e
No related branches found
No related tags found
3 merge requests
!316
Merge 1.0.1
,
!315
1.0.1 into master
,
!313
Docker issue
Pipeline
#38434
passed
4 years ago
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Dockerfile
+2
-2
2 additions, 2 deletions
Dockerfile
docker-compose.yml
+4
-4
4 additions, 4 deletions
docker-compose.yml
docker/nginx/nginx.conf
+1
-1
1 addition, 1 deletion
docker/nginx/nginx.conf
docker/nginx/smasch.conf
+1
-1
1 addition, 1 deletion
docker/nginx/smasch.conf
with
8 additions
and
8 deletions
Dockerfile
+
2
−
2
View file @
7a1c9ee2
...
@@ -21,5 +21,5 @@ RUN npm --version
...
@@ -21,5 +21,5 @@ RUN npm --version
RUN
npm
install
RUN
npm
install
ENTRYPOINT
[ "/bin/sh" ]
ENTRYPOINT
[ "/bin/sh" ]
CMD
[ "manage.py runserver 0.0.0.0:8
002
" ]
CMD
[ "manage.py runserver 0.0.0.0:8
888
" ]
EXPOSE
8
002
EXPOSE
8
888
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
4
−
4
View file @
7a1c9ee2
...
@@ -13,21 +13,21 @@ services:
...
@@ -13,21 +13,21 @@ services:
web
:
web
:
build
:
.
build
:
.
expose
:
expose
:
-
'
8
002
'
-
'
8
888
'
entrypoint
:
bash -c "sleep
5
entrypoint
:
bash -c "sleep
5
&&
python manage.py makemigrations web
&&
python manage.py makemigrations web
&& python manage.py migrate
&& python manage.py migrate
&& python manage.py migrate sessions
&& python manage.py migrate sessions
&& python manage.py collectstatic --noinput
&& python manage.py collectstatic --noinput
&& echo && echo && echo 'The server will start now...'
&& echo && echo && echo 'The server will start now...'
&& gunicorn -b 0.0.0.0:8
002
smash.wsgi:application --access-logfile access.log --error-logfile error.log"
&& gunicorn -b 0.0.0.0:8
888
smash.wsgi:application --access-logfile access.log --error-logfile error.log"
### To run the server through manage.py, use
:
### To run the server through manage.py, use
:
# && python manage.py runserver 0.0.0.0:8
002
"
# && python manage.py runserver 0.0.0.0:8
888
"
### To run the verbose tests, uncomment:
### To run the verbose tests, uncomment:
# python manage.py test -v3"
# python manage.py test -v3"
command
:
"
"
command
:
"
"
ports
:
ports
:
-
"
8
002:8002
"
-
"
8
888:8888
"
volumes
:
volumes
:
-
static_files:/tmp/static/
-
static_files:/tmp/static/
depends_on
:
depends_on
:
...
...
This diff is collapsed.
Click to expand it.
docker/nginx/nginx.conf
+
1
−
1
View file @
7a1c9ee2
...
@@ -43,7 +43,7 @@ http {
...
@@ -43,7 +43,7 @@ http {
proxy_set_header
X-Forwarded-For
$proxy_add_x_forwarded_for
;
proxy_set_header
X-Forwarded-For
$proxy_add_x_forwarded_for
;
proxy_set_header
Host
$http_host
;
proxy_set_header
Host
$http_host
;
proxy_redirect
off
;
proxy_redirect
off
;
proxy_pass
http://web:8
002
;
proxy_pass
http://web:8
888
;
}
}
}
}
}
}
This diff is collapsed.
Click to expand it.
docker/nginx/smasch.conf
+
1
−
1
View file @
7a1c9ee2
...
@@ -46,6 +46,6 @@ server {
...
@@ -46,6 +46,6 @@ server {
proxy_set_header
X
-
Forwarded
-
For
$
proxy_add_x_forwarded_for
;
proxy_set_header
X
-
Forwarded
-
For
$
proxy_add_x_forwarded_for
;
proxy_set_header
Host
$
http_host
;
proxy_set_header
Host
$
http_host
;
proxy_redirect
off
;
proxy_redirect
off
;
proxy_pass
http
://
web
:
8
002
;
proxy_pass
http
://
web
:
8
888
;
}
}
}
}
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