Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
data-portal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
ICAT
data-portal
Commits
fd5e8398
Commit
fd5e8398
authored
1 year ago
by
Alejandro De Maria Antolinos
Browse files
Options
Downloads
Patches
Plain Diff
Change docker compose to swarmerize it
parent
5d10357f
No related branches found
Branches containing commit
Tags
v0.3.1
Tags containing commit
1 merge request
!12
Resolve "Add the "data portal" into the project"
Pipeline
#113419
passed
1 year ago
Stage: validate
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docker-compose.yml
+3
-3
3 additions, 3 deletions
docker-compose.yml
docker/proxy/nginx.conf
+2
-2
2 additions, 2 deletions
docker/proxy/nginx.conf
with
5 additions
and
5 deletions
docker-compose.yml
+
3
−
3
View file @
fd5e8398
...
@@ -9,7 +9,7 @@ services:
...
@@ -9,7 +9,7 @@ services:
environment
:
environment
:
-
NODE_ENV=dev
-
NODE_ENV=dev
cryoet
:
cryoet
:
container_name
:
cryoet
container_name
:
dataportal-
cryoet
ports
:
ports
:
-
3002:80
-
3002:80
build
:
build
:
...
@@ -20,7 +20,7 @@ services:
...
@@ -20,7 +20,7 @@ services:
environment
:
environment
:
-
NODE_ENV=dev
-
NODE_ENV=dev
logistics
:
logistics
:
container_name
:
logistics
container_name
:
dataportal-
logistics
ports
:
ports
:
-
3001:80
-
3001:80
build
:
build
:
...
@@ -31,7 +31,7 @@ services:
...
@@ -31,7 +31,7 @@ services:
environment
:
environment
:
-
NODE_ENV=dev
-
NODE_ENV=dev
portal
:
portal
:
container_name
:
portal
container_name
:
data
portal
2
ports
:
ports
:
-
3000:80
-
3000:80
build
:
build
:
...
...
This diff is collapsed.
Click to expand it.
docker/proxy/nginx.conf
+
2
−
2
View file @
fd5e8398
server
{
server
{
listen
0.0.0.0
:
80
;
listen
0.0.0.0
:
80
;
server_name
cryoet.*
;
server_name
dataportal-
cryoet.*
;
location
/
{
location
/
{
proxy_pass
http://cryoet:80/
;
proxy_pass
http://cryoet:80/
;
...
@@ -22,6 +22,6 @@ server {
...
@@ -22,6 +22,6 @@ server {
server_name
~
^.*$;
server_name
~
^.*$;
location
/
{
location
/
{
return
404
;
proxy_pass
http://dataportal2:80/
;
}
}
}
}
\ No newline at end of file
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