From 928a5f98bf44039efc88bd72e768ec1245502ae5 Mon Sep 17 00:00:00 2001 From: Fabien Bourgeois Date: Wed, 21 Dec 2016 10:16:53 +0100 Subject: [PATCH] [CHG]Huge change : use registry for all base and prod images --- backups/base.yml | 2 +- nginx/base.yml | 2 +- odoo/backups/Dockerfile | 2 +- odoo/base.yml | 10 +++++----- odoo/golem/Dockerfile | 2 +- odoo/golem/Dockerfile.dev | 2 +- odoo/golem/Dockerfile.master | 2 +- odoo/golem/base.yml | 4 ++-- odoo/nginx/Dockerfile | 2 +- odoo/nginx/Dockerfile.dev | 2 +- odoo/odoo/Dockerfile.10.dev | 2 +- odoo/odoo/Dockerfile.dev | 2 +- odoo/prod.yml | 2 +- postgres/base.yml | 4 ++-- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/backups/base.yml b/backups/base.yml index 23b122c..adfeae3 100644 --- a/backups/base.yml +++ b/backups/base.yml @@ -4,4 +4,4 @@ services: rsyncvolumes: build: ./rsyncvolumes - image: rsyncvolumes:base + image: registry.yaltik.net/rsyncvolumes:base diff --git a/nginx/base.yml b/nginx/base.yml index 5db881d..641516a 100644 --- a/nginx/base.yml +++ b/nginx/base.yml @@ -2,4 +2,4 @@ version: '2' services: nginx: build: . - image: nginx:yaltik + image: registry.yaltik.net/nginx:yaltik diff --git a/odoo/backups/Dockerfile b/odoo/backups/Dockerfile index d0b7b83..e492cce 100644 --- a/odoo/backups/Dockerfile +++ b/odoo/backups/Dockerfile @@ -1,4 +1,4 @@ -FROM odoocmd:yaltik +FROM registry.yaltik.net/odoocmd:yaltik MAINTAINER Yaltik - Fabien Bourgeois ENV ODOO_ADMIN_PASSWORD admin diff --git a/odoo/base.yml b/odoo/base.yml index be15914..da36770 100644 --- a/odoo/base.yml +++ b/odoo/base.yml @@ -20,7 +20,7 @@ services: odoo: build: ./odoo - image: odoo:yaltik8 + image: registry.yaltik.net/odoo:yaltik8 environment: DB_MAXCONN: 20 XMLRPC_PORT: 8069 @@ -39,7 +39,7 @@ services: build: context: ./odoo dockerfile: Dockerfile.9 - image: odoo:yaltik9 + image: registry.yaltik.net/odoo:yaltik9 odoo10: extends: @@ -47,14 +47,14 @@ services: build: context: ./odoo dockerfile: Dockerfile.10 - image: odoo:yaltik10 + image: registry.yaltik.net/odoo:yaltik10 odoocmd: build: context: ./scripts - image: odoocmd:yaltik + image: registry.yaltik.net/odoocmd:yaltik odoobackup: build: context: ./backups - image: odoobackup:yaltik + image: registry.yaltik.net/odoobackup:yaltik diff --git a/odoo/golem/Dockerfile b/odoo/golem/Dockerfile index 9b368dc..e3da2d3 100644 --- a/odoo/golem/Dockerfile +++ b/odoo/golem/Dockerfile @@ -1,4 +1,4 @@ -FROM odoo:yaltik8 +FROM registry.yaltik.net/odoo:yaltik8 MAINTAINER Yaltik - Fabien Bourgeois WORKDIR /opt/odoo/extra-addons diff --git a/odoo/golem/Dockerfile.dev b/odoo/golem/Dockerfile.dev index 9723b61..925e098 100644 --- a/odoo/golem/Dockerfile.dev +++ b/odoo/golem/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM odoodev:yaltik8 +FROM registry.yaltik.net/odoodev:yaltik8 MAINTAINER Yaltik - Fabien Bourgeois WORKDIR /opt/odoo/extra-addons diff --git a/odoo/golem/Dockerfile.master b/odoo/golem/Dockerfile.master index cb85d24..5c85d3c 100644 --- a/odoo/golem/Dockerfile.master +++ b/odoo/golem/Dockerfile.master @@ -1,4 +1,4 @@ -FROM odoo:yaltik8 +FROM registry.yaltik.net/odoo:yaltik8 MAINTAINER Yaltik - Fabien Bourgeois WORKDIR /opt/odoo/extra-addons diff --git a/odoo/golem/base.yml b/odoo/golem/base.yml index f028ffa..987e82b 100644 --- a/odoo/golem/base.yml +++ b/odoo/golem/base.yml @@ -2,7 +2,7 @@ version: '2' services: golem: build: . - image: golem:yaltikbase + image: registry.yaltik.net/golem:yaltikbase extends: file: ../base.yml service: odoo @@ -10,7 +10,7 @@ services: build: context: . dockerfile: Dockerfile.master - image: golem:yaltikmaster + image: registry.yaltik.net/golem:yaltikmaster extends: file: ../base.yml service: odoo diff --git a/odoo/nginx/Dockerfile b/odoo/nginx/Dockerfile index b25ee7e..1bc1ae0 100644 --- a/odoo/nginx/Dockerfile +++ b/odoo/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:yaltik +FROM registry.yaltik.net/nginx:yaltik MAINTAINER Yaltik - Fabien Bourgeois # Default variables diff --git a/odoo/nginx/Dockerfile.dev b/odoo/nginx/Dockerfile.dev index 673aa6d..c112277 100644 --- a/odoo/nginx/Dockerfile.dev +++ b/odoo/nginx/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM nginx:yaltik +FROM registry.yaltik.net/nginx:yaltik MAINTAINER Yaltik - Fabien Bourgeois # Default variables diff --git a/odoo/odoo/Dockerfile.10.dev b/odoo/odoo/Dockerfile.10.dev index 9725d86..d358955 100644 --- a/odoo/odoo/Dockerfile.10.dev +++ b/odoo/odoo/Dockerfile.10.dev @@ -1,4 +1,4 @@ -FROM odoo:yaltik10 +FROM registry.yaltik.net/odoo:yaltik10 MAINTAINER Yaltik - Fabien Bourgeois RUN pip install --user watchdog diff --git a/odoo/odoo/Dockerfile.dev b/odoo/odoo/Dockerfile.dev index a08e608..26a1952 100644 --- a/odoo/odoo/Dockerfile.dev +++ b/odoo/odoo/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM odoo:yaltik8 +FROM registry.yaltik.net/odoo:yaltik8 MAINTAINER Yaltik - Fabien Bourgeois WORKDIR /opt/odoo/extra-addons diff --git a/odoo/prod.yml b/odoo/prod.yml index f9bd775..1f31b76 100644 --- a/odoo/prod.yml +++ b/odoo/prod.yml @@ -2,7 +2,7 @@ version: '2' services: nginx: build: ./nginx - image: nginx:odoo + image: registry.yaltik.net/nginx:odoo environment: NGINX_HOST: localhost 127.0.0.1 ODOO_SERVICE: odoo diff --git a/postgres/base.yml b/postgres/base.yml index 07d8e49..14d0629 100644 --- a/postgres/base.yml +++ b/postgres/base.yml @@ -4,9 +4,9 @@ services: build: context: . dockerfile: Dockerfile.95 - image: frpg:yaltik95 + image: registry.yaltik.net/postgres:yaltik95 postgres96: build: context: . dockerfile: Dockerfile.96 - image: frpg:yaltik96 + image: registry.yaltik.net/postgres:yaltik96