diff --git a/docker-compose.yml b/docker-compose.yml index 4078402..49b2a10 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,5 @@ version: "3" -networks: - traefik-docker_default: - external: true - services: university_db: image: postgres:16 @@ -15,8 +11,6 @@ services: - PGDATA=/var/lib/postgresql/data/pgdata volumes: - ./data:/var/lib/postgresql/data/pgdata - networks: - - traefik-docker_default university_cloud: build: @@ -26,9 +20,9 @@ services: container_name: "university_cloud" depends_on: - university_db -# ports: -# - "8069:8069" -# - "8072:8072" + ports: + - "8069:8069" + - "8072:8072" volumes: - ./files:/var/lib/odoo - ./config:/etc/odoo @@ -36,27 +30,4 @@ services: environment: - HOST=university_db - USER=${DB_USER:-odoo} - - PASSWORD=${DB_PASS:-odoo} - networks: - - traefik-docker_default - labels: - - "traefik.enable=true" - - - "traefik.http.routers.university_cloud.rule=Host(`${CLOUD_DOMAIN}`)" - - "traefik.http.routers.university_cloud.service=university_cloud" - - "traefik.http.services.university_cloud.loadbalancer.server.port=8069" - - "traefik.http.middlewares.university_cloud.compress=true" - - - "traefik.http.routers.university_cloud_im.entrypoints=websecure" - - "traefik.http.routers.university_cloud_im.rule=Host(`${CLOUD_DOMAIN}`) && PathPrefix(`/websocket`)" - - "traefik.http.routers.university_cloud_im.middlewares=upgradeheader, gzip, sslheader" - - "traefik.http.routers.university_cloud_im.tls=true" - - "traefik.http.routers.university_cloud_im.service=university_cloud_im" - - "traefik.http.services.university_cloud_im.loadbalancer.server.port=8072" - - - "traefik.http.middlewares.upgradeheader.headers.customrequestheaders.Upgrade=websocket" - - "traefik.http.middlewares.upgradeheader.headers.customrequestheaders.Connection=Upgrade" - - "traefik.http.middlewares.upgradeheader.headers.customrequestheaders=websocket,Upgrade" - - "traefik.http.middlewares.upgradeheader.headers.forcestsheader=true" - - "traefik.http.middlewares.sslheader.headers.customrequestheaders.X-Forwarded-Proto=https" - - "traefik.http.middlewares.gzip.compress=true" + - PASSWORD=${DB_PASS:-odoo} \ No newline at end of file