From e09769992e97d1e59fb514517c935a00425a99f9 Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude54@gmail.com>
Date: Tue, 2 May 2017 13:35:58 +0200
Subject: [PATCH] Use VERSION
---
.bumpversion.cfg | 3 ---
Dockerfile | 10 ++++------
docker/builder/build-in-docker.sh | 4 ++++
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index dd1aecbd3..ff5076a29 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -10,7 +10,4 @@ serialize = {major}.{minor}.{patch}
search = <version>{current_version}</version><!-- BUMP_VERSION -->
replace = <version>{new_version}</version><!-- BUMP_VERSION -->
-[bumpversion:file:Dockerfile]
-
[bumpversion:file:hbp.yml]
-
diff --git a/Dockerfile b/Dockerfile
index 8c5244eb4..65956c786 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,18 +7,16 @@ ARG VERSION
ENV DOCKERIZE_VERSION=v0.4.0
-RUN apk add --update ca-certificates wget \
+RUN apk add --no-cache --update ca-certificates wget \
&& update-ca-certificates \
- && wget -O /tmp/dockerize.tar.gz https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
+ && wget -O /tmp/dockerize.tar.gz "https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz" \
&& tar -C /usr/local/bin -xzvf /tmp/dockerize.tar.gz \
&& rm -rf /var/cache/apk/* /tmp/*
COPY docker/runner/config/application.tmpl /config/application.tmpl
COPY docker/runner/README.md docker/runner/run.sh /
-ENV PORTAL_BACKEND_VERSION=2.1.0
-
-COPY target/portal-backend-$PORTAL_BACKEND_VERSION.jar backend.jar
+COPY target/portal-backend-$VERSION.jar backend.jar
EXPOSE 8080
@@ -29,8 +27,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.description="Java backend for the MIP portal" \
org.label-schema.url="https://mip.humanbrainproject.eu" \
org.label-schema.vcs-type="git" \
- org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url="https://github.com/LREN-CHUV/portal-backend" \
+ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.version="$VERSION" \
org.label-schema.vendor="LREN CHUV" \
org.label-schema.license="AGPLv3" \
diff --git a/docker/builder/build-in-docker.sh b/docker/builder/build-in-docker.sh
index fc9df64b0..62c479510 100755
--- a/docker/builder/build-in-docker.sh
+++ b/docker/builder/build-in-docker.sh
@@ -1,7 +1,11 @@
#!/usr/bin/env bash
+echo ">>> Building inside Docker"
+
echo "Removing old target folder..."
rm -rf target/
echo "Packaging..."
mvn package
+
+echo ">>> Backend build is complete"
--
GitLab