Compare commits
	
		
			No commits in common. "8d71d16c6f6b12ce92cf6ccaadbc0874fcb939e4" and "ca2acfd0664c3d779dac8a0627464b996d5338ec" have entirely different histories. 
		
	
	
		
			8d71d16c6f
			...
			ca2acfd066
		
	
		|  | @ -1,5 +1,5 @@ | ||||||
| [options] | [options] | ||||||
| addons_path = /mnt/extra-addons | addons_path = addons, odoo/addons | ||||||
| ; data_dir = /var/lib/odoo | ; data_dir = /var/lib/odoo | ||||||
| ; admin_passwd = admin | ; admin_passwd = admin | ||||||
| ; csv_internal_sep = , | ; csv_internal_sep = , | ||||||
|  | @ -38,4 +38,6 @@ xmlrpc_port = 8069 | ||||||
| ; xmlrpcs_interface = | ; xmlrpcs_interface = | ||||||
| ; xmlrpcs_port = 8071 | ; xmlrpcs_port = 8071 | ||||||
| server_wide_modules = web,queue_job | server_wide_modules = web,queue_job | ||||||
| queue_job.channels = root:2 | 
 | ||||||
|  | [queue_job] | ||||||
|  | channels = root:2 | ||||||
|  | @ -1,9 +1,13 @@ | ||||||
| version: "3" | version: "3" | ||||||
| 
 | 
 | ||||||
|  | networks: | ||||||
|  |   traefik-docker_default: | ||||||
|  |     external: true | ||||||
|  | 
 | ||||||
| services: | services: | ||||||
|   university_db: |   enterprise_db: | ||||||
|     image: postgres:16 |     image: postgres:16 | ||||||
|     container_name: "university_db" |     container_name: "enterprise_db" | ||||||
|     environment: |     environment: | ||||||
|       - POSTGRES_DB=postgres |       - POSTGRES_DB=postgres | ||||||
|       - POSTGRES_USER=${DB_USER:-odoo} |       - POSTGRES_USER=${DB_USER:-odoo} | ||||||
|  | @ -11,23 +15,66 @@ services: | ||||||
|       - PGDATA=/var/lib/postgresql/data/pgdata |       - PGDATA=/var/lib/postgresql/data/pgdata | ||||||
|     volumes: |     volumes: | ||||||
|       - ./data:/var/lib/postgresql/data/pgdata |       - ./data:/var/lib/postgresql/data/pgdata | ||||||
|  |     networks: | ||||||
|  |       - traefik-docker_default | ||||||
| 
 | 
 | ||||||
|   university_cloud: |   enterprise_cloud: | ||||||
|     build: |     build: | ||||||
|       context: ./ |       context: ./ | ||||||
|       dockerfile: Dockerfile |       dockerfile: Dockerfile | ||||||
|     image: university:16 |     image: enterprise:16 | ||||||
|     container_name: "university_cloud" |     container_name: "enterprise_cloud" | ||||||
|     depends_on: |     depends_on: | ||||||
|       - university_db |       - enterprise_db | ||||||
|     ports: | #    ports: | ||||||
|       - "8069:8069" | #      - "8069:8069" | ||||||
|       - "8072:8072" | #      - "8072:8072" | ||||||
|     volumes: |     volumes: | ||||||
|       - ./files:/var/lib/odoo |       - ./files:/var/lib/odoo | ||||||
|       - ./config:/etc/odoo |       - ./config:/etc/odoo | ||||||
|       - ./addons:/mnt/extra-addons |       - ./addons:/mnt/extra-addons | ||||||
|     environment: |     environment: | ||||||
|       - HOST=university_db |       - HOST=cloud_db | ||||||
|       - USER=${DB_USER:-odoo} |       - USER=${DB_USER:-odoo} | ||||||
|       - PASSWORD=${DB_PASS:-odoo} |       - PASSWORD=${DB_PASS:-odoo} | ||||||
|  |     networks: | ||||||
|  |       - traefik-docker_default | ||||||
|  |     labels: | ||||||
|  |       - "traefik.enable=true" | ||||||
|  | 
 | ||||||
|  |       - "traefik.http.routers.enterprise_cloud.rule=Host(`${CLOUD_DOMAIN}`)" | ||||||
|  |       - "traefik.http.routers.enterprise_cloud.service=ospp_cloud" | ||||||
|  |       - "traefik.http.services.enterprise_cloud.loadbalancer.server.port=8069" | ||||||
|  |       - "traefik.http.middlewares.enterprise_cloud.compress=true" | ||||||
|  | 
 | ||||||
|  |       - "traefik.http.routers.enterprise_cloud_im.entrypoints=websecure" | ||||||
|  |       - "traefik.http.routers.enterprise_cloud_im.rule=Host(`${CLOUD_DOMAIN}`) && PathPrefix(`/websocket`)" | ||||||
|  |       - "traefik.http.routers.enterprise_cloud_im.middlewares=upgradeheader, gzip, sslheader" | ||||||
|  |       - "traefik.http.routers.enterprise_cloud_im.tls=true" | ||||||
|  |       - "traefik.http.routers.enterprise_cloud_im.service=ospp_cloud_im" | ||||||
|  |       - "traefik.http.services.enterprise_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" | ||||||
|  | 
 | ||||||
|  | #      - "traefik.http.routers.ospp_cloud.rule=Host(`${CLOUD_DOMAIN}`)" | ||||||
|  | #      - "traefik.http.routers.ospp_cloud.service=ospp_cloud" | ||||||
|  | #      - "traefik.http.services.ospp_cloud.loadbalancer.server.port=8069" | ||||||
|  | #      - "traefik.http.middlewares.ospp_cloud.compress=true" | ||||||
|  | #      - "traefik.http.routers.ospp_cloud_im.rule=Host(`${CLOUD_DOMAIN}`) && PathPrefix(`/websocket`)" | ||||||
|  | #      - "traefik.http.routers.ospp_cloud_im.service=ospp_cloud_im" | ||||||
|  | #      - "traefik.http.services.ospp_cloud_im.loadbalancer.server.port=8072" | ||||||
|  | #      - "traefik.http.services.ospp_cloud_im.loadbalancer.passHostHeader=true" | ||||||
|  | #      - "traefik.http.middlewares.ospp_cloud_im.compress=true" | ||||||
|  | #      - "traefik.http.middlewares.ospp_cloud_im.headers.contentSecurityPolicy=upgrade-insecure-requests" | ||||||
|  | #      - "traefik.http.middlewares.ospp_cloud_im.headers.customResponseHeaders.Content-Security-Policy=upgrade-insecure-requests" | ||||||
|  | #      - "traefik.http.middlewares.ospp_cloud_im.headers.customResponseHeaders.Content-Security-Policy-Report-Only=upgrade-insecure-requests" | ||||||
|  | #      - "traefik.http.middlewares.ospp_cloud_im.headers.customrequestheaders.Upgrade=websocket,keep-alive" | ||||||
|  | #      - "traefik.http.middlewares.ospp_cloud_im.headers.customrequestheaders.Connection=upgrade" | ||||||
|  | #      - "traefik.http.middlewares.ospp_cloud_im.headers.customrequestheaders.Sec-WebSocket-Version=13" | ||||||
|  | #      - "traefik.http.middlewares.ospp_cloud_im.headers.customrequestheaders.X-Forwarded-Proto=https,wss" | ||||||
|  | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue