From 02ae963a6977c2015d2ec0487bdcd91d1327134b Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Wed, 11 Dec 2019 19:52:26 +0100 Subject: [PATCH] Updated build scripts --- Dockerfile | 17 ++++++++--------- Makefile | 14 ++++++++++++++ build.sh | 9 --------- deploy.sh | 7 ------- glide.lock | 15 --------------- glide.yaml | 7 ------- go.mod | 9 +++++++++ 7 files changed, 31 insertions(+), 47 deletions(-) create mode 100644 Makefile delete mode 100755 build.sh delete mode 100755 deploy.sh delete mode 100644 glide.lock delete mode 100644 glide.yaml create mode 100644 go.mod diff --git a/Dockerfile b/Dockerfile index 25d719a..687c7d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,12 @@ -FROM golang as builder -RUN curl https://glide.sh/get | sh +FROM golang:alpine as builder -WORKDIR /go/src/app -COPY glide.lock glide.yaml ./ -RUN glide install -COPY . . -RUN CGO_ENABLED=0 GOOS=linux go build -a app . +WORKDIR /src +COPY go.* ./ +RUN go mod download +COPY *.go ./ +RUN CGO_ENABLED=0 GOOS=linux go build -o app . FROM scratch COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /go/src/app/app /app -ENTRYPOINT ["/app"] \ No newline at end of file +COPY --from=builder /src/app /app +ENTRYPOINT ["/app"] diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1949a53 --- /dev/null +++ b/Makefile @@ -0,0 +1,14 @@ +IMAGE := k8r.eu/justjanne/$(shell basename $(shell git remote get-url origin) .git) +TAGS := $(shell git describe --always --tags HEAD) + +.PHONY: build +build: + docker build --pull -t $(IMAGE):$(TAGS) . + docker tag $(IMAGE):$(TAGS) $(IMAGE):latest + @echo Successfully tagged $(IMAGE):$(TAGS) as latest + +.PHONY: push +push: build + docker push $(IMAGE):$(TAGS) + docker push $(IMAGE):latest + @echo Successfully pushed $(IMAGE):$(TAGS) as latest diff --git a/build.sh b/build.sh deleted file mode 100755 index 243201b..0000000 --- a/build.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -IMAGE=k8r.eu/justjanne/statsbot -TAGS=$(git describe --always --tags HEAD) - -docker build -t $IMAGE:$TAGS . -docker tag $IMAGE:$TAGS $IMAGE:latest -echo Successfully tagged $IMAGE:latest -docker push $IMAGE:$TAGS -docker push $IMAGE:latest \ No newline at end of file diff --git a/deploy.sh b/deploy.sh deleted file mode 100755 index 9f40960..0000000 --- a/deploy.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -IMAGE=k8r.eu/justjanne/statsbot -TAGS=$(git describe --always --tags HEAD) -DEPLOYMENT=statsbot -POD=statsbot - -kubectl set image deployment/$DEPLOYMENT $POD=$IMAGE:$TAGS \ No newline at end of file diff --git a/glide.lock b/glide.lock deleted file mode 100644 index a6584b6..0000000 --- a/glide.lock +++ /dev/null @@ -1,15 +0,0 @@ -hash: 9aa87de7030f5b57ee15949488773eed43794051d931d592b57d01ba08baa1b3 -updated: 2018-05-24T02:24:44.532048957+02:00 -imports: -- name: github.com/lib/pq - version: 90697d60dd844d5ef6ff15135d0203f65d2f53b8 - subpackages: - - oid -- name: github.com/lrstanley/girc - version: 102f17f86306c2152a8c6188f9bb8b0e7288de31 -- name: golang.org/x/crypto - version: 75e913eb8a8e3d31a97b216de09de106a7b07681 - subpackages: - - scrypt - - sha3 -testImports: [] diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index 04ed8d7..0000000 --- a/glide.yaml +++ /dev/null @@ -1,7 +0,0 @@ -package: git.kuschku.de/justjanne/statsbot -import: -- package: github.com/lrstanley/girc -- package: github.com/lib/pq -- package: golang.org/x/crypto - subpackages: - - scrypt \ No newline at end of file diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..16b3409 --- /dev/null +++ b/go.mod @@ -0,0 +1,9 @@ +module git.kuschku.de/justjanne/statsbot + +go 1.13 + +require ( + github.com/lib/pq v0.0.0-20180523175426-90697d60dd84 + github.com/lrstanley/girc v0.0.0-20180427160007-102f17f86306 + golang.org/x/crypto v0.0.0-20180523194057-75e913eb8a8e +) -- GitLab