From 648c35ac1a85cb0dba11fbcf2a1cf72adbe99082 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 19 Jan 2022 12:58:39 +0000 Subject: [PATCH 1/3] update swarm --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 803dd47..7792239 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ ARG EXE4J_VERSION=${EXE4J_VERSION:-6_0} RUN yum install -y https://download-gcdn.ej-technologies.com/exe4j/exe4j_linux_$EXE4J_VERSION.rpm \ && yum clean all -ARG JENKINS_SWARM_VERSION=${JENKINS_SWARM_VERSION:-3.14} +ARG JENKINS_SWARM_VERSION=${JENKINS_SWARM_VERSION:-3.29} USER omero RUN curl --create-dirs -sSLo /tmp/swarm-client-$JENKINS_SWARM_VERSION.jar https://repo.jenkins-ci.org/releases/org/jenkins-ci/plugins/swarm-client/$JENKINS_SWARM_VERSION/swarm-client-$JENKINS_SWARM_VERSION.jar From bd54fb70f81da421ed751ba1159124bbbec91e0a Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Fri, 21 Jan 2022 09:28:04 +0000 Subject: [PATCH 2/3] bump omero-install version to 5.6.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7792239..89ccecd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ENV OMERO_INSTALL /tmp/omero-install/linux RUN yum install -y git \ && yum clean all -ARG TAG=v5.5.0-rc2 +ARG TAG=v5.6.3 RUN git clone -b $TAG https://github.com/ome/omero-install.git /tmp/omero-install RUN bash $OMERO_INSTALL/step01_centos7_init.sh RUN bash $OMERO_INSTALL/step01_centos_java_deps.sh From ef9d79496d084fc034c8cd7fc372eaf3926d295f Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Fri, 21 Jan 2022 09:29:08 +0000 Subject: [PATCH 3/3] remove exe4j --- Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 89ccecd..0b8e42a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,10 +20,6 @@ RUN git clone -b $TAG https://github.com/ome/omero-install.git /tmp/omero-instal RUN bash $OMERO_INSTALL/step01_centos7_init.sh RUN bash $OMERO_INSTALL/step01_centos_java_deps.sh -ARG EXE4J_VERSION=${EXE4J_VERSION:-6_0} - -RUN yum install -y https://download-gcdn.ej-technologies.com/exe4j/exe4j_linux_$EXE4J_VERSION.rpm \ - && yum clean all ARG JENKINS_SWARM_VERSION=${JENKINS_SWARM_VERSION:-3.29}