Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Odoo: Remove 9.0 and update 10.0-12.0 to release 20181008 #4923

Merged
merged 1 commit into from
Oct 8, 2018

Conversation

d-fence
Copy link
Contributor

@d-fence d-fence commented Oct 8, 2018

Hello,

this is an update of all Odoo supported versions.
Also, this removes the deprecated 9.0 version.

Thanks

@yosifkit
Copy link
Member

yosifkit commented Oct 8, 2018

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 7e5fab4..16a9fe6 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,4 +1,3 @@
-odoo:9 @ amd64
 odoo:10 @ amd64
 odoo:11 @ amd64
 odoo:11 @ arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index c4b38c0..a260fd6 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,5 +1,3 @@
-odoo:9
-odoo:9.0
 odoo:10
 odoo:10.0
 odoo:11
diff --git a/odoo_10/Dockerfile b/odoo_10/Dockerfile
index 2ce28e0..0ff84d0 100644
--- a/odoo_10/Dockerfile
+++ b/odoo_10/Dockerfile
@@ -23,10 +23,10 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 10.0
-ENV ODOO_RELEASE 20180808
+ENV ODOO_RELEASE 20181008
 RUN set -x; \
         curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo '98736953010be3c578f4b9eb1c7e2c87da93a7bd odoo.deb' | sha1sum -c - \
+        && echo 'b94e32470287957ff4e1111e6c58e85c057f60db odoo.deb' | sha1sum -c - \
         && dpkg --force-depends -i odoo.deb \
         && apt-get update \
         && apt-get -y install -f --no-install-recommends \
diff --git a/odoo_11/Dockerfile b/odoo_11/Dockerfile
index 7f548b9..adcb587 100644
--- a/odoo_11/Dockerfile
+++ b/odoo_11/Dockerfile
@@ -26,10 +26,10 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 11.0
-ENV ODOO_RELEASE 20180808
+ENV ODOO_RELEASE 20181008
 RUN set -x; \
         curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo 'a48d588b76fd642ac9e1af63a38e4d87ee20531a odoo.deb' | sha1sum -c - \
+        && echo '28804ea596ea88eeb1cec5c6089436af0bd67d57 odoo.deb' | sha1sum -c - \
         && dpkg --force-depends -i odoo.deb \
         && apt-get update \
         && apt-get -y install -f --no-install-recommends \
diff --git a/odoo_9/Dockerfile b/odoo_9/Dockerfile
deleted file mode 100644
index 900305a..0000000
diff --git a/odoo_9/entrypoint.sh b/odoo_9/entrypoint.sh
deleted file mode 100755
index a958c3c..0000000
diff --git a/odoo_9/openerp-server.conf b/odoo_9/openerp-server.conf
deleted file mode 100644
index 8d9d297..0000000
diff --git a/odoo_latest/Dockerfile b/odoo_latest/Dockerfile
index 39e1ef2..dc42bda 100644
--- a/odoo_latest/Dockerfile
+++ b/odoo_latest/Dockerfile
@@ -26,10 +26,10 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 12.0
-ENV ODOO_RELEASE 20181004
+ENV ODOO_RELEASE 20181008
 RUN set -x; \
         curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo '3c8718416df355bc823a0c1cb4af6b8141183a3b odoo.deb' | sha1sum -c - \
+        && echo 'caedca66b655268f2f0fb8d2661593dabbf46b88 odoo.deb' | sha1sum -c - \
         && dpkg --force-depends -i odoo.deb \
         && apt-get update \
         && apt-get -y install -f --no-install-recommends \

@yosifkit
Copy link
Member

yosifkit commented Oct 8, 2018

Build test of #4923; 3c3f1ec; amd64 (odoo):

$ bashbrew build odoo:12.0
Building bashbrew/cache:e33a4ac754023442059dea22b7f922466161f8634fcc51d5a3a5121a5157dbc7 (odoo:12.0)
Tagging odoo:12.0
Tagging odoo:12
Tagging odoo:latest

$ test/run.sh odoo:12.0
testing odoo:12.0
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build odoo:11.0
Building bashbrew/cache:830a776949ef74eb94cc76e28271d09498dd59c9162663061b93cd1ecf78cd89 (odoo:11.0)
Tagging odoo:11.0
Tagging odoo:11

$ test/run.sh odoo:11.0
testing odoo:11.0
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build odoo:10.0
Building bashbrew/cache:f487862fd727d823a10dc38d91f18637fede034ce6ab9a0e2037ed73d4ecb716 (odoo:10.0)
Tagging odoo:10.0
Tagging odoo:10

$ test/run.sh odoo:10.0
testing odoo:10.0
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@yosifkit yosifkit merged commit cb985d9 into docker-library:master Oct 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants