Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
szofttech-projekt
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
team-ducktape
szofttech-projekt
Commits
58c44db0
Commit
58c44db0
authored
1 year ago
by
Pesti Tamás
Browse files
Options
Downloads
Patches
Plain Diff
Fix nginx not using correct domains
parent
f816b197
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
backend/run_in_docker.sh
+1
-1
1 addition, 1 deletion
backend/run_in_docker.sh
frontend/run_in_docker.sh
+1
-1
1 addition, 1 deletion
frontend/run_in_docker.sh
nginx/nginx.conf
+2
-2
2 additions, 2 deletions
nginx/nginx.conf
nginx/run_in_docker.sh
+1
-1
1 addition, 1 deletion
nginx/run_in_docker.sh
with
5 additions
and
5 deletions
backend/run_in_docker.sh
+
1
−
1
View file @
58c44db0
...
...
@@ -9,7 +9,7 @@ sudo docker run \
-w
/app
\
-p
8080:8080
\
-u
$(
id
-u
)
:
$(
id
-g
)
\
--name
szofttech
_
webapp
_
backend
\
--name
szofttech
-
webapp
-
backend
\
--network
szofttech_webapp_network
\
eclipse-temurin:21-jdk
\
./mvnw spring-boot:run
This diff is collapsed.
Click to expand it.
frontend/run_in_docker.sh
+
1
−
1
View file @
58c44db0
...
...
@@ -9,7 +9,7 @@ sudo docker run \
-u
$(
id
-u
)
:
$(
id
-g
)
\
-p
3000:3000
\
-w
/app
\
--name
szofttech
_
webapp
_
frontend
\
--name
szofttech
-
webapp
-
frontend
\
--network
szofttech_webapp_network
\
node:latest
\
./start.sh
This diff is collapsed.
Click to expand it.
nginx/nginx.conf
+
2
−
2
View file @
58c44db0
...
...
@@ -18,14 +18,14 @@ http {
# backend
location
/api
{
# rewrite /api/(.*) /$1 break;
proxy_pass
http://szofttech
_
webapp
_
backend:8080
;
proxy_pass
http://szofttech
-
webapp
-
backend:8080
;
}
# otherwise fallback to frontend
location
/
{
client_max_body_size
100M
;
# rewrite ^/static/(.*)$ /$1 break;
proxy_pass
http://szofttech
_
webapp
_
frontend:3000
;
proxy_pass
http://szofttech
-
webapp
-
frontend:3000
;
proxy_set_header
Host
$host
;
proxy_set_header
X-Real-IP
$remote_addr
;
proxy_set_header
X-Forwarded-Proto
$scheme
;
...
...
This diff is collapsed.
Click to expand it.
nginx/run_in_docker.sh
+
1
−
1
View file @
58c44db0
...
...
@@ -4,6 +4,6 @@ sudo docker run \
--rm
\
-v
"
$(
pwd
)
/nginx/nginx.conf"
:/etc/nginx/nginx.conf
\
-p
80:80
\
--name
szofttech
_
webapp
_
nginx
\
--name
szofttech
-
webapp
-
nginx
\
--network
szofttech_webapp_network
\
nginx:latest
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