From e081fdb564b8e9df55aa3559a3ef71d3d21b8edd Mon Sep 17 00:00:00 2001 From: Fabien Bourgeois Date: Fri, 28 Oct 2016 17:02:46 +0200 Subject: [PATCH] [IMP]Global renaming for custom images and avoiding official conflicts --- odoo/backups/Dockerfile | 2 +- odoo/base.yml | 10 +++++----- odoo/dev.yml | 4 ++-- odoo/golem/Dockerfile | 2 +- odoo/golem/Dockerfile.dev | 2 +- odoo/golem/Dockerfile.master | 2 +- odoo/golem/base.yml | 4 ++-- odoo/golem/dev.yml | 2 +- odoo/odoo/Dockerfile.10.dev | 2 +- odoo/odoo/Dockerfile.dev | 2 +- odoo/prod.yml | 2 +- postgres/base.yml | 4 ++-- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/odoo/backups/Dockerfile b/odoo/backups/Dockerfile index 17143cc..d0b7b83 100644 --- a/odoo/backups/Dockerfile +++ b/odoo/backups/Dockerfile @@ -1,4 +1,4 @@ -FROM odoocmd:latest +FROM odoocmd:yaltik MAINTAINER Yaltik - Fabien Bourgeois ENV ODOO_ADMIN_PASSWORD admin diff --git a/odoo/base.yml b/odoo/base.yml index 9f63d51..9190c8f 100644 --- a/odoo/base.yml +++ b/odoo/base.yml @@ -20,7 +20,7 @@ services: odoo: build: ./odoo - image: odoo:8.0 + image: odoo:yaltik8 environment: DB_MAXCONN: 20 WORKERS: 2 @@ -37,7 +37,7 @@ services: build: context: ./odoo dockerfile: Dockerfile.9 - image: odoo:9.0 + image: odoo:yaltik9 odoo10: extends: @@ -45,12 +45,12 @@ services: build: context: ./odoo dockerfile: Dockerfile.10 - image: odoo:10.0 + image: odoo:yaltik10 odoocmd: build: ./scripts - image: odoocmd:latest + image: odoocmd:yaltik odoobackup: build: ./backups - image: odoobackup:latest + image: odoobackup:yaltik diff --git a/odoo/dev.yml b/odoo/dev.yml index 807781a..44100be 100644 --- a/odoo/dev.yml +++ b/odoo/dev.yml @@ -8,7 +8,7 @@ services: build: context: ./odoo dockerfile: Dockerfile.dev - image: odoodev:8.0 + image: odoodev:yaltik8 environment: ADMIN_PASSWORD: dev LIST_DB: "True" @@ -26,7 +26,7 @@ services: build: context: ./odoo dockerfile: Dockerfile.10.dev - image: odoodev:10.0 + image: odoodev:yaltik10 environment: ADMIN_PASSWORD: dev LIST_DB: "True" diff --git a/odoo/golem/Dockerfile b/odoo/golem/Dockerfile index 58bcbec..9b368dc 100644 --- a/odoo/golem/Dockerfile +++ b/odoo/golem/Dockerfile @@ -1,4 +1,4 @@ -FROM odoo:8.0 +FROM odoo:yaltik8 MAINTAINER Yaltik - Fabien Bourgeois WORKDIR /opt/odoo/extra-addons diff --git a/odoo/golem/Dockerfile.dev b/odoo/golem/Dockerfile.dev index 3c539b1..9723b61 100644 --- a/odoo/golem/Dockerfile.dev +++ b/odoo/golem/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM odoodev:8.0 +FROM odoodev:yaltik8 MAINTAINER Yaltik - Fabien Bourgeois WORKDIR /opt/odoo/extra-addons diff --git a/odoo/golem/Dockerfile.master b/odoo/golem/Dockerfile.master index 0096bb5..cb85d24 100644 --- a/odoo/golem/Dockerfile.master +++ b/odoo/golem/Dockerfile.master @@ -1,4 +1,4 @@ -FROM odoo:8.0 +FROM odoo:yaltik8 MAINTAINER Yaltik - Fabien Bourgeois WORKDIR /opt/odoo/extra-addons diff --git a/odoo/golem/base.yml b/odoo/golem/base.yml index df5709b..f028ffa 100644 --- a/odoo/golem/base.yml +++ b/odoo/golem/base.yml @@ -2,7 +2,7 @@ version: '2' services: golem: build: . - image: golem:base + image: golem:yaltikbase extends: file: ../base.yml service: odoo @@ -10,7 +10,7 @@ services: build: context: . dockerfile: Dockerfile.master - image: golem:master + image: golem:yaltikmaster extends: file: ../base.yml service: odoo diff --git a/odoo/golem/dev.yml b/odoo/golem/dev.yml index 515e2e3..5ec465a 100644 --- a/odoo/golem/dev.yml +++ b/odoo/golem/dev.yml @@ -5,7 +5,7 @@ services: file: ../dev.yml service: odoodev build: . - image: golem:dev + image: golem:yaltikdev volumes: - /home/fabien/bak/code/odoo/yaltik:/opt/odoo/custom-addons/yaltik:ro - /home/fabien/bak/code/odoo/golem:/opt/odoo/custom-addons/golem:ro diff --git a/odoo/odoo/Dockerfile.10.dev b/odoo/odoo/Dockerfile.10.dev index 6e5f8ed..d56aa4e 100644 --- a/odoo/odoo/Dockerfile.10.dev +++ b/odoo/odoo/Dockerfile.10.dev @@ -1,4 +1,4 @@ -FROM odoo:10.0 +FROM odoo:yaltik10 MAINTAINER Yaltik - Fabien Bourgeois RUN pip install watchdog diff --git a/odoo/odoo/Dockerfile.dev b/odoo/odoo/Dockerfile.dev index ddccf06..a08e608 100644 --- a/odoo/odoo/Dockerfile.dev +++ b/odoo/odoo/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM odoo:8.0 +FROM odoo:yaltik8 MAINTAINER Yaltik - Fabien Bourgeois WORKDIR /opt/odoo/extra-addons diff --git a/odoo/prod.yml b/odoo/prod.yml index e6fac4d..5fe9718 100644 --- a/odoo/prod.yml +++ b/odoo/prod.yml @@ -2,7 +2,7 @@ version: '2' services: nginx: build: ./nginx - image: odoonginx:latest + image: odoonginx:yaltik environment: NGINX_HOST: localhost 127.0.0.1 ODOO_HOST: odoo diff --git a/postgres/base.yml b/postgres/base.yml index 21d0e79..07d8e49 100644 --- a/postgres/base.yml +++ b/postgres/base.yml @@ -4,9 +4,9 @@ services: build: context: . dockerfile: Dockerfile.95 - image: frpg:9.5 + image: frpg:yaltik95 postgres96: build: context: . dockerfile: Dockerfile.96 - image: frpg:9.6 + image: frpg:yaltik96