From 0116d18fb719fe341bde42850927869abc937c16 Mon Sep 17 00:00:00 2001 From: Robert Auer Date: Fri, 10 Aug 2018 14:49:56 +0200 Subject: [PATCH 1/4] Add backup indicator to volumes --- dogu.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dogu.json b/dogu.json index af16667..63c6736 100644 --- a/dogu.json +++ b/dogu.json @@ -17,13 +17,15 @@ "Name": "data", "Path": "/var/lib/scm", "Owner": "1000", - "Group": "1000" + "Group": "1000", + "NeedsBackup": true }, { "Name": "custom.init.script.d", "Path": "/var/lib/custom.init.script.d", "Owner": "1000", - "Group": "1000" + "Group": "1000", + "NeedsBackup": true }], "HealthCheck": { "Type": "tcp", From 9591ca55b63928ec8d6265679874a6aa3e24ef22 Mon Sep 17 00:00:00 2001 From: Robert Auer Date: Fri, 10 Aug 2018 14:52:46 +0200 Subject: [PATCH 2/4] Use current java version; remove empty continuation lines --- Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 891e8f2..2c2c549 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cloudogu.com/official/java:8u121-4 +FROM registry.cloudogu.com/official/java:8u151-3 MAINTAINER Sebastian Sdorra # scm-server environment @@ -21,16 +21,13 @@ RUN set -x \ && mkdir /opt \ && tar -C /opt -xf /tmp/scm-server.tar \ && cd /tmp \ - # install scm-script-plugin && mkdir -p WEB-INF/lib \ && curl -Lks http://repo1.maven.org/maven2/org/codehaus/groovy/groovy-all/${GROOVY_VERSION}/groovy-all-${GROOVY_VERSION}.jar -o /tmp/WEB-INF/lib/groovy-all-${GROOVY_VERSION}.jar \ && curl -Lks http://maven.scm-manager.org/nexus/content/repositories/releases/sonia/scm/plugins/scm-script-plugin/${SCM_SCRIPT_PLUGIN}/scm-script-plugin-${SCM_SCRIPT_PLUGIN}.jar -o /tmp/WEB-INF/lib/scm-script-plugin-${SCM_SCRIPT_PLUGIN}.jar \ && zip -u /opt/scm-server/var/webapp/scm-webapp.war WEB-INF/lib/* \ - # cleanup && rm -rf /tmp/* /var/cache/apk/* \ - # set mercurial system ca-certificates # see https://github.com/cloudogu/ecosystem/issues/193 && mkdir /etc/mercurial \ From 15a48e49d2369df669c479e4150ae17b690a0a37 Mon Sep 17 00:00:00 2001 From: Robert Auer Date: Mon, 13 Aug 2018 14:51:24 +0200 Subject: [PATCH 3/4] Remove deprecated maintainer declaration and use label instead --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2c2c549..43ab6fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM registry.cloudogu.com/official/java:8u151-3 -MAINTAINER Sebastian Sdorra +LABEL maintainer="sebastian.sdorra@cloudogu.com" # scm-server environment ENV SCM_VERSION=1.55 \ From fda9a9c44bfeab771ddf67f7327bd639e8907954 Mon Sep 17 00:00:00 2001 From: Robert Auer Date: Mon, 13 Aug 2018 15:00:11 +0200 Subject: [PATCH 4/4] Bump scm to version 1.60 --- Dockerfile | 2 +- dogu.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 43ab6fa..6a3fad7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM registry.cloudogu.com/official/java:8u151-3 LABEL maintainer="sebastian.sdorra@cloudogu.com" # scm-server environment -ENV SCM_VERSION=1.55 \ +ENV SCM_VERSION=1.60 \ SCM_SCRIPT_PLUGIN=1.6 \ GROOVY_VERSION=2.4.12 \ SCM_HOME=/var/lib/scm \ diff --git a/dogu.json b/dogu.json index 63c6736..c01d729 100644 --- a/dogu.json +++ b/dogu.json @@ -1,6 +1,6 @@ { "Name": "official/scm", - "Version": "1.55-2", + "Version": "1.60-1", "DisplayName": "SCM-Manager", "Description": "The easiest way to share and manage your Git, Mercurial and Subversion repositories over http.", "Category": "Development Apps",