Merge pull request #44 from cyberway/develop

Merge develop to master

.buildkite/pipeline.yml

@@ -7,7 +7,7 @@ steps:
 
   - label: ":floppy_disk: upload image"
     command: ".buildkite/steps/publish-image.sh"
-    branches: "master alfa develop ci-*"
+    branches: "master alfa develop ci-* v*.*.*"
     timeout: 20
 
   - wait

.buildkite/steps/build-image.sh

@@ -6,6 +6,9 @@ IMAGETAG=${BUILDKITE_BRANCH:-master}
 BRANCHNAME=${BUILDKITE_BRANCH:-master}
 COMPILETYPE=RelWithDebInfo
 
+TAGREF=${BUILDKITE_TAG:+"tags/$BUILDKITE_TAG"}
+REF=${TAGREF:-"heads/$BUILDKITE_BRANCH"}
+
 if [[ "${IMAGETAG}" == "master" ]]; then
     BUILDTYPE="stable"
     COMPILETYPE=Release
@@ -16,4 +19,4 @@ else
 fi
 
 cd Docker
-docker build -t cyberway/cyberway-notifier:${IMAGETAG} --build-arg=branch=${BRANCHNAME} --build-arg buildtype=${BUILDTYPE} --build-arg compiletype=${COMPILETYPE} .
+docker build -t cyberway/cyberway-notifier:${IMAGETAG} --build-arg=branch=${BRANCHNAME} --build-arg buildtype=${BUILDTYPE} --build-arg compiletype=${COMPILETYPE} --build-arg ref=${REF}.

Docker/Dockerfile

@@ -3,14 +3,15 @@ FROM cyberway/builder:$buildtype as builder
 
 ARG branch=master
 ARG compiletype=RelWithDebInfo
+ARG ref=heads/$branch
 
 RUN cd /opt && wget https://github.com/nats-io/cnats/archive/v1.8.0.tar.gz && tar -xzf v1.8.0.tar.gz \
     && ln -s /opt/nats.c-1.8.0 /opt/nats.c \
     && cd nats.c-1.8.0 && mkdir build && cd ./build && cmake -DCMAKE_BUILD_TYPE=$compiletype .. && make && make install
 
 RUN echo "/opt/cnats-1.8.0/pbuf/lib/linux/" > /etc/ld.so.conf.d/protobuf-c.conf && ldconfig
 
-ADD https://api.github.com/repos/cyberway/cyberway.notifier/git/refs/heads/$branch /etc/version.json
+ADD https://api.github.com/repos/cyberway/cyberway.notifier/git/refs/$ref /etc/version.json
 
 RUN cd /opt && git clone -b $branch https://github.com/cyberway/cyberway.notifier.git --recursive