Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] PG env use the DB_ vars like intended in the container #33

Open
wants to merge 2 commits into
base: 14.0
Choose a base branch
from
Open

[FIX] PG env use the DB_ vars like intended in the container #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fed80f2
[FIX] PG env use the DB_ vars like intended in the container
PierrickBrun Nov 30, 2021
7ad119c
fixup! [FIX] PG env use the DB_ vars like intended in the container
Jun 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions ci.docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ services:
- SENTRY=True
- PGSSLMODE=require
- DB_NAME=${BUILD_NAME}
- PGDATABASE=${BUILD_NAME}
- DB_USER=${CI_PROJECT_NAME}
- PGUSER=${CI_PROJECT_NAME}
- DB_HOST=pgci.home.arpa
- PGHOST=pgci.home.arpa
labels:
- "traefik.enable=true"
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}.rule=Host(`${DOMAIN}`)"
Expand All @@ -41,4 +36,4 @@ volumes:
networks:
traefik:
external: true
version: '3.7'
version: '3.7'
6 changes: 4 additions & 2 deletions clear-ci.secrets.docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# never commit this file
# only to set secrets
# encrypt me with sops --age $KEYGENERATEDINCI --encrypt clear-ci.secrets.docker-compose.yml > ci.secrets.docker-compose.yml
# encrypt me with:
# sops --age $KEYGENERATEDINCI --encrypt clear-ci.secrets.docker-compose.yml > ci.secrets.docker-compose.yml
# The sops public key ($KEYGENERATEDINCI) can be found in ~gitlab-runner/.config/sops/age/keys.txt
version: "3.7"
services:
odoo:
environment:
- DB_USER=
- DB_HOST=
- DB_PASSWORD=
- PGPASSWORD=
- ENCRYPTION_KEY_CI=
11 changes: 8 additions & 3 deletions clear-prod.secrets.docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
# never commit this file
# only to set secrets
# encrypt me with sops --age $KEYGENERATEDINCI --encrypt clear-prod.secrets.docker-compose.yml > prod.secrets.docker-compose.yml
# only used to set secrets
# encrypt me with:
# sops --age $KEYGENERATEDINPROD --encrypt clear-prod.secrets.docker-compose.yml > prod.secrets.docker-compose.yml
# The sops public key ($KEYGENERATEDINPROD) can be found in ~app/.config/sops/age/keys.txt
version: "3.7"
services:
odoo:
environment:
- DB_USER=
- DB_HOST=
- DB_NAME=
- DB_PASSWORD=
- PGPASSWORD=
- ENCRYPTION_KEY_CI=
- ENCRYPTION_KEY_PROD=
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ services:
labels:
docky.main.service: true
docky.user: odoo
version: '3.7'
version: '3.7'
8 changes: 1 addition & 7 deletions prod.docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,9 @@ services:
environment:
- MARABUNTA_MODE=prod
- ADDONS_PATH=/odoo/links,/odoo/local-src,/odoo/src/odoo/addons,/odoo/src/addons
- ODOO_BASE_URL=TODO
- ODOO_BASE_URL=https://TODO
- SENTRY=True
- PGSSLMODE=require
- DB_NAME=TODO
- PGDATABASE=TODO
- DB_USER=TODO
- PGUSER=TODO
- DB_HOST=TODO
- PGHOST=TODO
volumes:
- ~/data/${COMPOSE_PROJECT_NAME}/addons:/data/odoo/addons
- ~/data/${COMPOSE_PROJECT_NAME}/filestore:/data/odoo/filestore
Expand Down