Skip to content

Commit 96051be

Browse files
committed
feat: rename compose.yaml and migration.yaml
1 parent d724601 commit 96051be

File tree

7 files changed

+10
-11
lines changed

7 files changed

+10
-11
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ Specifies path for local(custom) code to be used, by default is /odoo/odoo/addon
178178

179179
### MIGRATION_CONFIG_FILE
180180

181-
Specifies path for migration config file, by default is /odoo/migration.yml
181+
Specifies path for migration config file, by default is /odoo/migration.yaml
182182

183183
### DEMO
184184

@@ -245,7 +245,7 @@ The main configuration options of Odoo can be configured through environment var
245245

246246
Look in [11.0/templates/odoo.cfg.tmpl](11.0/templates/odoo.cfg.tmpl) to see the full list.
247247

248-
While most of the variables can be set in the `docker-compose.yml` file so we can have different values for different environments, the `ADDONS_PATH` **must** be set in the `Dockerfile` of your project with a line such as:
248+
While most of the variables can be set in the `compose.yaml` file so we can have different values for different environments, the `ADDONS_PATH` **must** be set in the `Dockerfile` of your project with a line such as:
249249

250250
```
251251
ENV ADDONS_PATH=/odoo/local-src,/odoo/external-src/server-tools,/odoo/src/addons

example/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ COPY ./data /odoo/data
1515
COPY ./songs /odoo/songs
1616
COPY ./setup.py /odoo/
1717
COPY ./VERSION /odoo/
18-
COPY ./migration.yml /odoo/
18+
COPY ./migration.yaml /odoo/
1919
USER root
2020
# RUN apt-get update \
2121
# && apt-get install -y --no-install-recommends parallel libsasl2-dev libldap2-dev libssl-dev libmagic1 libpq-dev build-essential python3-dev libffi-dev pkg-config libcairo2-dev libgirepository1.0-dev\

example/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ Follow the steps:
3333

3434
docker build -t youruser/odoo-project-example .
3535

36-
8. Optionally create a [docker-compose.yml](docker-compose.yml) file. This
36+
8. Optionally create a [compose.yaml](compose.yaml) file. This
3737
example is a development composition.

example/odoo/.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
**/.git/**/*
22
**/.git
33
**/.gitignore
4-
**/.travis.yml
54
**/LICENSE
65
**/*.pyc
76
**/README.md

example/test-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
- KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf:8080
2121
- ODOO_REPORT_URL=http://odoo:8069
2222
- LOCAL_CODE_PATH=/odoo/odoo/addons
23-
- MIGRATION_CONFIG_FILE=/odoo/migration.yml
23+
- MIGRATION_CONFIG_FILE=/odoo/migration.yaml
2424
# cached database dumps config for `runmigration` and `runtests`
2525
- CREATE_DB_CACHE=false # set it to 'true' to create dumps
2626
- LOAD_DB_CACHE=true # by default will always search for existing dumps

test.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ echo "Working in $TMP"
3636
on_exit() {
3737
echo "Cleaning up temporary directory..."
3838
cd $TMP
39-
docker compose -f test-compose.yml down
39+
docker compose -f test-compose.yaml down
4040
rm -rf $TMP
4141
rm -f /tmp/odoo.tar.gz
4242
}
@@ -46,18 +46,18 @@ trap on_exit EXIT
4646
# run 'runtests' in the container
4747
# extra arguments are passed to the 'run' command (example: -e FOO=bar is added to the list of args)
4848
docoruntests() {
49-
docker compose -f test-compose.yml run --rm -e LOCAL_USER_ID=999 $@ odoo runtests
49+
docker compose -f test-compose.yaml run --rm -e LOCAL_USER_ID=999 $@ odoo runtests
5050
}
5151
# run 'runmigration' in the container
5252
# extra arguments are passed to the 'run' command (example: -e FOO=bar is added to the list of args)
5353
docorunmigration() {
54-
docker compose -f test-compose.yml run --rm -e LOCAL_USER_ID=999 $@ odoo runmigration
54+
docker compose -f test-compose.yaml run --rm -e LOCAL_USER_ID=999 $@ odoo runmigration
5555
}
5656
docodown() {
57-
docker compose -f test-compose.yml down
57+
docker compose -f test-compose.yaml down
5858
}
5959
docoruncmd() {
60-
docker compose -f test-compose.yml run --rm -e LOCAL_USER_ID=999 $@
60+
docker compose -f test-compose.yaml run --rm -e LOCAL_USER_ID=999 $@
6161
}
6262

6363
cp -ra ./example/. "$TMP/"

0 commit comments

Comments
 (0)