Skip to content
This repository has been archived by the owner on Apr 13, 2020. It is now read-only.

Commit

Permalink
[DCK] Prepare for copier
Browse files Browse the repository at this point in the history
- Add a minimal valid `.copier-answers.yml` file.
- Warn in README that you need to upgrade to doodba-copier-template.
- Little changes to reduce diff later.

@Tecnativa TT20357
  • Loading branch information
Jairo Llopis committed Mar 23, 2020
1 parent d23bf43 commit aefc104
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 18 deletions.
3 changes: 3 additions & 0 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Changes here will be overwritten by Copier
_commit: v0.0.0-0-0
_src_path: https://github.com/Tecnativa/doodba-copier-template.git
4 changes: 2 additions & 2 deletions .vscode/doodba.code-snippets
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"\ttarget: ${40} \\$ODOO_VERSION",
"\tmerges:",
"\t\t- ${40} \\$ODOO_VERSION",
"\t\t- ${40} refs/pull/${50:1234}/head",
"\t\t- ${40} refs/pull/${50:1234}/head"
],
"description": "For Loop"
"description": "Git-aggregator repo definition with merges"
}
}
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"ms-python.python",
"ms-azuretools.vscode-docker",
"qub.qub-xml-vscode",
"syler.sass-indented",
"syler.sass-indented"
]
}
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# Dockerized Odoo project scaffolding

[Read the docs.](https://github.com/Tecnativa/doodba#scaffolding)
**⚠️ UPSTREAM SCAFFOLDING DEPRECATED ⚠️**

To continue updating with the new Copier-based system, read
https://github.com/Tecnativa/doodba-copier-template/blob/master/docs/migrating-from-doodba-scaffolding.md.

[Old scaffolding docs](https://github.com/Tecnativa/doodba/tree/dbaaa2782a2d00e093063ebee3478c1d4093def3#scaffolding).
1 change: 1 addition & 0 deletions common.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
version: "2.4"

services:
odoo:
image: $ODOO_IMAGE:$ODOO_MINOR
Expand Down
10 changes: 4 additions & 6 deletions prod.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
version: "2.4"

services:
odoo:
extends:
Expand All @@ -19,14 +20,11 @@ services:
default:
inverseproxy_shared:
labels:
traefik.longpolling.frontend.rule:
"Host:${DOMAIN_PROD};PathPrefix:/longpolling/"
traefik.longpolling.frontend.rule: "Host:${DOMAIN_PROD};PathPrefix:/longpolling/"
traefik.www.frontend.rule: "Host:${DOMAIN_PROD}"
traefik.alt.frontend.redirect.regex: "^(.*)://${DOMAIN_PROD_ALT}/(.*)$$"
traefik.alt.frontend.redirect.replacement: "$$1://${DOMAIN_PROD}/$$2"
traefik.alt.frontend.rule: "Host:${DOMAIN_PROD_ALT}"
traefik.alt.frontend.redirect.regex:
"^(.*)://${DOMAIN_PROD_ALT}/(.*)$$"
traefik.alt.frontend.redirect.replacement:
"$$1://${DOMAIN_PROD}/$$2"

db:
extends:
Expand Down
13 changes: 5 additions & 8 deletions test.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
version: "2.4"

services:
odoo:
extends:
Expand All @@ -22,10 +23,8 @@ services:
globalwhitelist_shared:
inverseproxy_shared:
labels:
traefik.frontend.headers.customResponseHeaders:
"X-Robots-Tag:noindex, nofollow"
traefik.longpolling.frontend.rule:
"Host:${DOMAIN_TEST};PathPrefix:/longpolling/"
traefik.frontend.headers.customResponseHeaders: "X-Robots-Tag:noindex, nofollow"
traefik.longpolling.frontend.rule: "Host:${DOMAIN_TEST};PathPrefix:/longpolling/"
traefik.www.frontend.rule: "Host:${DOMAIN_TEST}"
command:
- odoo
Expand Down Expand Up @@ -54,15 +53,13 @@ services:
traefik.docker.network: "inverseproxy_shared"
traefik.enable: "true"
traefik.frontend.passHostHeader: "true"
traefik.port: "8025"
traefik.frontend.rule: "Host:${DOMAIN_TEST};PathPrefixStrip:/smtpfake/"
traefik.port: "8025"
volumes:
- "smtpconf:/etc/mailhog:ro,z"
entrypoint: [sh, -c]
command:
- test -r /etc/mailhog/auth &&
export MH_AUTH_FILE=/etc/mailhog/auth;
exec MailHog
- test -r /etc/mailhog/auth && export MH_AUTH_FILE=/etc/mailhog/auth; exec MailHog

networks:
default:
Expand Down

0 comments on commit aefc104

Please sign in to comment.