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 9.0-11.0: update to release 20180808 #4706

Merged
merged 1 commit into from
Aug 9, 2018
Merged

Conversation

odony
Copy link
Contributor

@odony odony commented Aug 8, 2018

Also includes conversion to new library definition format and support for arm64v8 in 11.0, courtesy of @odidev (this supersedes #4666)

Thanks!

Also includes:
- conversion to new library definition format
- add support for arm64v8 in 11.0

The latter is courtesy of @odidev, thanks!
@tianon
Copy link
Member

tianon commented Aug 8, 2018

FYI @d-fence

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 66de4ab..e35286b 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,3 +1,4 @@
 odoo:9 @ amd64
 odoo:10 @ amd64
 odoo:latest @ amd64
+odoo:latest @ arm64v8
diff --git a/odoo_10/Dockerfile b/odoo_10/Dockerfile
index e36f6e9..2ce28e0 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 20180710
+ENV ODOO_RELEASE 20180808
 RUN set -x; \
         curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo '5aa056fa00a2f405652ba1386807c59ae563af29 odoo.deb' | sha1sum -c - \
+        && echo '98736953010be3c578f4b9eb1c7e2c87da93a7bd 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
index ae91100..900305a 100644
--- a/odoo_9/Dockerfile
+++ b/odoo_9/Dockerfile
@@ -23,10 +23,10 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 9.0
-ENV ODOO_RELEASE 20180710
+ENV ODOO_RELEASE 20180808
 RUN set -x; \
         curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}c.${ODOO_RELEASE}_all.deb \
-        && echo '79ec48555a83507ba8956f4bb25840f5c033178a odoo.deb' | sha1sum -c - \
+        && echo '25f90d98509484bc4b54174ccb814dd96ddb797b 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_latest/Dockerfile b/odoo_latest/Dockerfile
index 6cf0d7e..7f548b9 100644
--- a/odoo_latest/Dockerfile
+++ b/odoo_latest/Dockerfile
@@ -26,10 +26,10 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 11.0
-ENV ODOO_RELEASE 20180710
+ENV ODOO_RELEASE 20180808
 RUN set -x; \
         curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo 'b843864476bb149d1b5715b7fa3ef726b3658d6a odoo.deb' | sha1sum -c - \
+        && echo 'a48d588b76fd642ac9e1af63a38e4d87ee20531a odoo.deb' | sha1sum -c - \
         && dpkg --force-depends -i odoo.deb \
         && apt-get update \
         && apt-get -y install -f --no-install-recommends \

@tianon
Copy link
Member

tianon commented Aug 9, 2018

LGTM

Build test of #4706; 49d6eaf; amd64 (odoo):

$ bashbrew build odoo:11.0
Building bashbrew/cache:d5f5e28771eeb92cc5af5a43ea98a28968a4f4c103a11c8a3059e351ca291748 (odoo:11.0)
Tagging odoo:11.0
Tagging odoo:11
Tagging odoo:latest

$ 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:062ff525a26afde09d3703438a3225a3a8808afc38d94159edccacfecde3479e (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


$ bashbrew build odoo:9.0
Building bashbrew/cache:c6453bfc4e40a01bc9f002a5c296bb651b0989342150f2539a3db16ea772457a (odoo:9.0)
Tagging odoo:9.0
Tagging odoo:9

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

Build test of #4706; 49d6eaf; arm64v8 (odoo):

$ bashbrew build odoo:11.0
Pulling debian:stretch (odoo:11.0)
Building bashbrew/cache:6f60333031a52d0247efdf1d40c46c959011ffbadfde03efa11ff6fe14512007 (odoo:11.0)
Tagging odoo:11.0
Tagging odoo:11
Tagging odoo:latest

$ 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
skipping "odoo:10.0" (due to architecture "arm64v8"; only "amd64" supported)

$ test/run.sh odoo:10.0
testing odoo:10.0
	image does not exist!


$ bashbrew build odoo:9.0
skipping "odoo:9.0" (due to architecture "arm64v8"; only "amd64" supported)

$ test/run.sh odoo:9.0
testing odoo:9.0
	image does not exist!

The following images failed at least one test:

  • odoo:
    • odoo:10.0
    • odoo:9.0

@tianon tianon merged commit e1df772 into docker-library:master Aug 9, 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