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

[CHG]GOLEM from v2 to default v3

Browse Source
This commit is contained in:
Fabien Bourgeois 2017-06-27 17:09:57 +02:00
parent f9d8d9f0c7
commit 3d7b781b95
7 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
odoo/golem/Dockerfile
View File

@ -9,5 +9,5 @@ RUN git clone --depth 1 -b 8.0 https://github.com/OCA/community-data-files \
WORKDIR /opt/odoo/custom-addons WORKDIR /opt/odoo/custom-addons
ADD code/yaltik8.tar.gz yaltik/ ADD code/yaltik8.tar.gz yaltik/
ADD code/golem.tar.gz golem/ ADD code/golemv2.tar.gz golem/
WORKDIR /opt/odoo WORKDIR /opt/odoo

11
odoo/golem/Dockerfile.master
View File

@ -2,12 +2,13 @@ FROM registry.yaltik.net/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
RUN git clone --depth 1 -b 8.0 https://github.com/OCA/community-data-files \ RUN git clone --depth 1 -b 10.0 https://github.com/OCA/community-data-files \
&& git clone --depth 1 -b 8.0 https://github.com/OCA/l10n-france \ && git clone --depth 1 -b 10.0 https://github.com/OCA/l10n-france \
&& git clone --depth 1 -b 8.0 https://github.com/OCA/partner-contact \ && git clone --depth 1 -b 10.0 https://github.com/OCA/partner-contact \
&& git clone --depth 1 -b 8.0 https://github.com/OCA/vertical-association && git clone --depth 1 -b 10.0 https://github.com/OCA/vertical-association \
&& git clone --depth 1 -b 10.0 https://github.com/OCA/web
WORKDIR /opt/odoo/custom-addons WORKDIR /opt/odoo/custom-addons
ADD code/yaltik8.tar.gz yaltik/ ADD code/yaltik10.tar.gz yaltik/
ADD code/golemmaster.tar.gz golem/ ADD code/golemmaster.tar.gz golem/
WORKDIR /opt/odoo WORKDIR /opt/odoo

4
odoo/golem/Dockerfile.v3
View File

@ -1,4 +1,4 @@
FROM registry.yaltik.net/odoo:yaltik10 FROM registry.yaltik.net/odoo:yaltikstable
MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com> MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
WORKDIR /opt/odoo/extra-addons WORKDIR /opt/odoo/extra-addons
@ -10,5 +10,5 @@ RUN git clone --depth 1 -b 10.0 https://github.com/OCA/community-data-files \
WORKDIR /opt/odoo/custom-addons WORKDIR /opt/odoo/custom-addons
ADD code/yaltik10.tar.gz yaltik/ ADD code/yaltik10.tar.gz yaltik/
ADD code/golemv3.tar.gz golem/ ADD code/golem.tar.gz golem/
WORKDIR /opt/odoo WORKDIR /opt/odoo

2
odoo/golem/Dockerfile.v3.dev
View File

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

8
odoo/golem/base.yml
View File

@ -1,8 +1,8 @@
version: '2' version: '2'
services: services:
golem: golemv2:
build: . build: .
image: registry.yaltik.net/golem:yaltikbase image: registry.yaltik.net/golem:yaltikv2
extends: extends:
file: ../base.yml file: ../base.yml
service: odoo service: odoo
@ -14,11 +14,11 @@ services:
extends: extends:
file: ../base.yml file: ../base.yml
service: odoo service: odoo
golemv3: golem:
build: build:
context: . context: .
dockerfile: Dockerfile.v3 dockerfile: Dockerfile.v3
image: registry.yaltik.net/golem:yaltikv3 image: registry.yaltik.net/golem:yaltikstable
extends: extends:
file: ../base.yml file: ../base.yml
service: odoo service: odoo

6
odoo/golem/code.sh
View File

@ -5,7 +5,7 @@ cd $CODE_PATH/odoo/yaltik/ && git archive --format=tar.gz 8.0 \
> $LOCAL_PATH/yaltik8.tar.gz && > $LOCAL_PATH/yaltik8.tar.gz &&
cd $CODE_PATH/odoo/yaltik/ && git archive --format=tar.gz 10.0 \ cd $CODE_PATH/odoo/yaltik/ && git archive --format=tar.gz 10.0 \
> $LOCAL_PATH/yaltik10.tar.gz && > $LOCAL_PATH/yaltik10.tar.gz &&
cd $CODE_PATH/odoo/golem && git archive --format=tar.gz stable \ cd $CODE_PATH/odoo/golem && git archive --format=tar.gz 2 \
> $LOCAL_PATH/golem.tar.gz && > $LOCAL_PATH/golemv2.tar.gz &&
git archive --format=tar.gz master > $LOCAL_PATH/golemmaster.tar.gz git archive --format=tar.gz master > $LOCAL_PATH/golemmaster.tar.gz
git archive --format=tar.gz 3 > $LOCAL_PATH/golemv3.tar.gz git archive --format=tar.gz stable > $LOCAL_PATH/golem.tar.gz

2
odoo/golem/dev.yml
View File

@ -6,7 +6,7 @@ services:
file: ../dev.yml file: ../dev.yml
service: odoodev service: odoodev
build: . build: .
image: golem:yaltikdev image: golem:yaltikdev8
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