From 08332798df03727d3c2200f2654a5e88f4e61617 Mon Sep 17 00:00:00 2001 From: an Date: Thu, 14 Dec 2017 08:07:46 +0100 Subject: [PATCH] Enable automated gitlab build and k8s deployment. --- Dockerfile | 2 -- dockerbuild.sh-dist | 6 ------ genbuilddate.sh | 9 --------- genversion.sh | 12 ------------ 4 files changed, 29 deletions(-) delete mode 100755 dockerbuild.sh-dist delete mode 100755 genbuilddate.sh delete mode 100755 genversion.sh diff --git a/Dockerfile b/Dockerfile index c58e55e..106161d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,8 +13,6 @@ WORKDIR /app RUN go get -d code.dnix.de/an/flokatilib/... RUN go get -d code.dnix.de/an/xlog RUN go get -d ./... -RUN ./genversion.sh -RUN ./genbuilddate.sh RUN go build -o mmflokati . CMD ["/app/mmflokati"] diff --git a/dockerbuild.sh-dist b/dockerbuild.sh-dist deleted file mode 100755 index 3b07f12..0000000 --- a/dockerbuild.sh-dist +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -VERSION=`git rev-parse --abbrev-ref HEAD` -BUILD=`git rev-list HEAD --count` -echo $VERSION-$BUILD -docker build -t dr.dnix.de/flokatirc:$VERSION-$BUILD -f Dockerfile . -docker push dr.dnix.de/flokatirc:$VERSION-$BUILD diff --git a/genbuilddate.sh b/genbuilddate.sh deleted file mode 100755 index 1f0314f..0000000 --- a/genbuilddate.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -BUILDDATEGO="builddate.go" -echo "package main" >$BUILDDATEGO -echo "" >>$BUILDDATEGO -echo "const (" >>$BUILDDATEGO -echo -n " FlokatiBuilddate = \"" >>$BUILDDATEGO -echo -n `date` >>$BUILDDATEGO -echo "\"" >>$BUILDDATEGO -echo ")" >>$BUILDDATEGO diff --git a/genversion.sh b/genversion.sh deleted file mode 100755 index ddff8b0..0000000 --- a/genversion.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -VERSIONGO="version.go" -echo "package main" >$VERSIONGO -echo "" >>$VERSIONGO -echo "const (" >>$VERSIONGO -echo -n " FlokatiVersion = \"" >>$VERSIONGO -echo -n `git rev-parse --abbrev-ref HEAD` >>$VERSIONGO -echo "\"" >>$VERSIONGO -echo -n " FlokatiBuild = \"" >>$VERSIONGO -echo -n `git rev-list HEAD --count` >>$VERSIONGO -echo "\"" >>$VERSIONGO -echo ")" >>$VERSIONGO