Skip to content

Commit

Permalink
removing reverse proxy, as we have our own
Browse files Browse the repository at this point in the history
  • Loading branch information
clezag committed Aug 19, 2024
1 parent 1e2f7e2 commit ef6f713
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
C3NAV_TAG=897cf68ccc1731372ee3fba6044b6292f7bdc3d3
C3NAV_DOMAIN=c3nav.docker.localhost

TRAEFIK_HTTP_PORT=8000
SERVER_PORT=8000

COMPOSE_FILE=c3nav.docker-compose.yml
2 changes: 1 addition & 1 deletion .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
env:
X_C3NAV_TAG: 897cf68ccc1731372ee3fba6044b6292f7bdc3d3
X_C3NAV_DOMAIN: maps.sfscon.testingmachine.eu
X_TRAEFIK_HTTP_PORT: 1001
X_SERVER_PORT: 1001

- name: Deploy application
uses: noi-techpark/github-actions/docker-deploy@v2
Expand Down
42 changes: 2 additions & 40 deletions c3nav.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,8 @@ services:
healthcheck:
<<: *healthcheck_defaults
test: curl -f http://localhost:8000/
labels:
- traefik.enable=true
- traefik.http.services.c3nav-core.loadbalancer.server.port=8000
- traefik.http.routers.c3nav.rule=PathPrefix(`/`)
- traefik.http.routers.c3nav.entrypoints=websecure
- traefik.http.routers.c3nav.middlewares=add-hsts-header
- traefik.http.middlewares.add-hsts-header.headers.stsseconds=63072000
- traefik.http.middlewares.add-hsts-header.headers.stspreload=true
- traefik.http.middlewares.add-hsts-header.headers.stsincludesubdomains=true
expose:
- "8000"
#- "5000"
ports:
- "${SERVER_PORT:-8000}:8000"

c3nav-workers:
<<: [*restart-policy, *c3nav-defaults]
Expand Down Expand Up @@ -110,34 +100,6 @@ services:
soft: 10032
hard: 10032

traefik:
image: traefik:${TRAEFIK_TAG:-v2.10}
# Enables the web UI and tells Traefik to listen to docker
command:
- --api.insecure=true
- --api.dashboard=true
- --providers.docker
- --providers.docker.exposedByDefault=false
- --providers.docker.allowEmptyServices=true
- --entrypoints.web.address=:8080/tcp
# - --entrypoints.web.http.redirections.entryPoint.to=websecure
# - --entrypoints.web.http.redirections.entryPoint.scheme=https
# - --entrypoints.websecure.address=:8443/tcp
# - --entrypoints.websecure.http.tls=true
- --entrypoints.traefik.address=:9000/tcp
ports:
# The HTTP port
- "${TRAEFIK_HTTP_PORT:-8000}:8080"
# The HTTPS port
# - "8443:8443"
# The Web UI (enabled by --api.insecure=true)
- "127.0.0.1:9000:9000"
volumes:
# So that Traefik can listen to the Docker events
- type: bind
source: /run/docker.sock
target: /var/run/docker.sock

volumes:
c3nav-postgres:
c3nav-redis:

0 comments on commit ef6f713

Please sign in to comment.