Yaltik/docker_images
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[CHG]Huge change : use registry for all base and prod images

Browse Source
This commit is contained in:
Fabien Bourgeois 2016-12-21 10:16:53 +01:00
parent 964f2d69c7
commit 928a5f98bf
14 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backups/base.yml
View File

@ -4,4 +4,4 @@ services:
rsyncvolumes:
build: ./rsyncvolumes
image: rsyncvolumes:base
image: registry.yaltik.net/rsyncvolumes:base

2
nginx/base.yml
View File

@ -2,4 +2,4 @@ version: '2'
services:
nginx:
build: .
image: nginx:yaltik
image: registry.yaltik.net/nginx:yaltik

2
odoo/backups/Dockerfile
View File

@ -1,4 +1,4 @@
FROM odoocmd:yaltik
FROM registry.yaltik.net/odoocmd:yaltik
MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
ENV ODOO_ADMIN_PASSWORD admin

10
odoo/base.yml
View File

@ -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

2
odoo/golem/Dockerfile
View File

@ -1,4 +1,4 @@
FROM odoo:yaltik8
FROM registry.yaltik.net/odoo:yaltik8
MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
WORKDIR /opt/odoo/extra-addons

2
odoo/golem/Dockerfile.dev
View File

@ -1,4 +1,4 @@
FROM odoodev:yaltik8
FROM registry.yaltik.net/odoodev:yaltik8
MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
WORKDIR /opt/odoo/extra-addons

2
odoo/golem/Dockerfile.master
View File

@ -1,4 +1,4 @@
FROM odoo:yaltik8
FROM registry.yaltik.net/odoo:yaltik8
MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
WORKDIR /opt/odoo/extra-addons

4
odoo/golem/base.yml
View File

@ -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

2
odoo/nginx/Dockerfile
View File

@ -1,4 +1,4 @@
FROM nginx:yaltik
FROM registry.yaltik.net/nginx:yaltik
MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
# Default variables

2
odoo/nginx/Dockerfile.dev
View File

@ -1,4 +1,4 @@
FROM nginx:yaltik
FROM registry.yaltik.net/nginx:yaltik
MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
# Default variables

2
odoo/odoo/Dockerfile.10.dev
View File

@ -1,4 +1,4 @@
FROM odoo:yaltik10
FROM registry.yaltik.net/odoo:yaltik10
MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
RUN pip install --user watchdog

2
odoo/odoo/Dockerfile.dev
View File

@ -1,4 +1,4 @@
FROM odoo:yaltik8
FROM registry.yaltik.net/odoo:yaltik8
MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
WORKDIR /opt/odoo/extra-addons

2
odoo/prod.yml
View File

@ -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

4
postgres/base.yml
View File

@ -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