From cd7e53fac71cc90bb3e5a92ae62b1d4fab639172 Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Fri, 25 Aug 2017 10:28:09 +0100 Subject: [PATCH 1/2] Bump devslave-c7 Docker image version to 0.3.1 This should allow to consume omero-install 5.3.3 and fix the encoding issues affecting the integration tests --- nginx/Dockerfile | 2 +- server/Dockerfile | 2 +- slave/Dockerfile | 2 +- web/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 48348865..c171faf5 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM openmicroscopy/devslave-c7:0.3.0 +FROM openmicroscopy/devslave-c7:0.3.1 MAINTAINER OME diff --git a/server/Dockerfile b/server/Dockerfile index bc8b046d..a2c70e41 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -1,4 +1,4 @@ -FROM openmicroscopy/devslave-c7:0.3.0 +FROM openmicroscopy/devslave-c7:0.3.1 MAINTAINER OME diff --git a/slave/Dockerfile b/slave/Dockerfile index af48aa91..ba97d29e 100644 --- a/slave/Dockerfile +++ b/slave/Dockerfile @@ -1,4 +1,4 @@ -FROM openmicroscopy/devslave-c7:0.3.0 +FROM openmicroscopy/devslave-c7:0.3.1 MAINTAINER OME diff --git a/web/Dockerfile b/web/Dockerfile index 5956b755..64a14e59 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,4 +1,4 @@ -FROM openmicroscopy/devslave-c7:0.3.0 +FROM openmicroscopy/devslave-c7:0.3.1 MAINTAINER OME From 58e422c42d1ea9670abe664737b5a4edf28e937c Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Fri, 25 Aug 2017 15:22:57 +0100 Subject: [PATCH 2/2] Try to use deprecated-2017Q2 group --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d3831675..b03b2c5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ sudo: required +group: deprecated-2017Q2 language: python