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

[IMP]Global renaming for custom images and avoiding official conflicts

Browse Source
This commit is contained in:
Fabien Bourgeois 2016-10-28 17:02:46 +02:00
parent 864d40eaac
commit e081fdb564
12 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
odoo/backups/Dockerfile
View File

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

10
odoo/base.yml
View File

@ -20,7 +20,7 @@ services:
odoo: odoo:
build: ./odoo build: ./odoo
image: odoo:8.0 image: odoo:yaltik8
environment: environment:
DB_MAXCONN: 20 DB_MAXCONN: 20
WORKERS: 2 WORKERS: 2
@ -37,7 +37,7 @@ services:
build: build:
context: ./odoo context: ./odoo
dockerfile: Dockerfile.9 dockerfile: Dockerfile.9
image: odoo:9.0 image: odoo:yaltik9
odoo10: odoo10:
extends: extends:
@ -45,12 +45,12 @@ services:
build: build:
context: ./odoo context: ./odoo
dockerfile: Dockerfile.10 dockerfile: Dockerfile.10
image: odoo:10.0 image: odoo:yaltik10
odoocmd: odoocmd:
build: ./scripts build: ./scripts
image: odoocmd:latest image: odoocmd:yaltik
odoobackup: odoobackup:
build: ./backups build: ./backups
image: odoobackup:latest image: odoobackup:yaltik

4
odoo/dev.yml
View File

@ -8,7 +8,7 @@ services:
build: build:
context: ./odoo context: ./odoo
dockerfile: Dockerfile.dev dockerfile: Dockerfile.dev
image: odoodev:8.0 image: odoodev:yaltik8
environment: environment:
ADMIN_PASSWORD: dev ADMIN_PASSWORD: dev
LIST_DB: "True" LIST_DB: "True"
@ -26,7 +26,7 @@ services:
build: build:
context: ./odoo context: ./odoo
dockerfile: Dockerfile.10.dev dockerfile: Dockerfile.10.dev
image: odoodev:10.0 image: odoodev:yaltik10
environment: environment:
ADMIN_PASSWORD: dev ADMIN_PASSWORD: dev
LIST_DB: "True" LIST_DB: "True"

2
odoo/golem/Dockerfile
View File

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

2
odoo/golem/Dockerfile.dev
View File

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

2
odoo/golem/Dockerfile.master
View File

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

4
odoo/golem/base.yml
View File

@ -2,7 +2,7 @@ version: '2'
services: services:
golem: golem:
build: . build: .
image: golem:base image: golem:yaltikbase
extends: extends:
file: ../base.yml file: ../base.yml
service: odoo service: odoo
@ -10,7 +10,7 @@ services:
build: build:
context: . context: .
dockerfile: Dockerfile.master dockerfile: Dockerfile.master
image: golem:master image: golem:yaltikmaster
extends: extends:
file: ../base.yml file: ../base.yml
service: odoo service: odoo

2
odoo/golem/dev.yml
View File

@ -5,7 +5,7 @@ services:
file: ../dev.yml file: ../dev.yml
service: odoodev service: odoodev
build: . build: .
image: golem:dev image: golem:yaltikdev
volumes: volumes:
- /home/fabien/bak/code/odoo/yaltik:/opt/odoo/custom-addons/yaltik:ro - /home/fabien/bak/code/odoo/yaltik:/opt/odoo/custom-addons/yaltik:ro
- /home/fabien/bak/code/odoo/golem:/opt/odoo/custom-addons/golem:ro - /home/fabien/bak/code/odoo/golem:/opt/odoo/custom-addons/golem:ro

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

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

2
odoo/odoo/Dockerfile.dev
View File

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

2
odoo/prod.yml
View File

@ -2,7 +2,7 @@ version: '2'
services: services:
nginx: nginx:
build: ./nginx build: ./nginx
image: odoonginx:latest image: odoonginx:yaltik
environment: environment:
NGINX_HOST: localhost 127.0.0.1 NGINX_HOST: localhost 127.0.0.1
ODOO_HOST: odoo ODOO_HOST: odoo

4
postgres/base.yml
View File

@ -4,9 +4,9 @@ services:
build: build:
context: . context: .
dockerfile: Dockerfile.95 dockerfile: Dockerfile.95
image: frpg:9.5 image: frpg:yaltik95
postgres96: postgres96:
build: build:
context: . context: .
dockerfile: Dockerfile.96 dockerfile: Dockerfile.96
image: frpg:9.6 image: frpg:yaltik96