From 91f995bc7955b26da790dccf89401b04e434139a Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude54@gmail.com>
Date: Thu, 25 Aug 2016 18:58:03 +0200
Subject: [PATCH] Personalise push notification
---
Dockerfile.builder | 4 ++--
docker/runner/slack.json | 2 +-
docker_push.sh | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Dockerfile.builder b/Dockerfile.builder
index 97dee452d..3cd9e990f 100644
--- a/Dockerfile.builder
+++ b/Dockerfile.builder
@@ -6,9 +6,9 @@ MAINTAINER mirco.nasuti@chuv.ch
RUN adduser --quiet --uid 1000 build
USER build
-COPY ./docker/builder/build-in-docker.sh /build-in-docker.sh
+COPY ./docker/builder/build-in-docker.sh /
VOLUME /opt/portal/
WORKDIR /opt/portal/
-CMD ["bash", "/build-in-docker.sh"]
+CMD ["/build-in-docker.sh"]
diff --git a/docker/runner/slack.json b/docker/runner/slack.json
index 313d8c5f6..d00bd5002 100644
--- a/docker/runner/slack.json
+++ b/docker/runner/slack.json
@@ -1 +1 @@
-{"channel": "#dev-activity", "username": "webhookbot", "text": "Pushed a new version of hbpmip/portal-backend to Docker hub", "icon_emoji": ":whale:"}
+{"channel": "#dev-activity", "username": "webhookbot", "text": "${USER^} pushed a new version of hbpmip/portal-backend to Docker hub", "icon_emoji": ":whale:"}
diff --git a/docker_push.sh b/docker_push.sh
index 8da820693..fdf341b3b 100755
--- a/docker_push.sh
+++ b/docker_push.sh
@@ -27,4 +27,6 @@ else
fi
$CAPTAIN push --branch-tags=false --commit-tags=true portal-backend
-curl -k -X POST --data-urlencode payload@$WORKSPACE/docker/runner/slack.json https://hbps1.chuv.ch/slack/dev-activity
+eval "echo $(cat $WORKSPACE/docker/runner/slack.json)" > $WORKSPACE/target/slack.json
+curl -k -X POST --data-urlencode payload@$WORKSPACE/target/slack.json https://hbps1.chuv.ch/slack/dev-activity
+rm -f $WORKSPACE/target/slack.json
--
GitLab