diff --git a/Dockerfile b/Dockerfile index 050de3dc1b971b7a32c840d84e7292972d8e0592..dd4eff61395f9939b7e6db400c6df7c03674545b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,13 @@ FROM golang -RUN curl https://glide.sh/get | sh - RUN apt-get update && apt-get install -y --no-install-recommends \ imagemagick \ libmagickwand-dev WORKDIR /go/src/app +COPY go.* ./ +RUN go mod download COPY . . -RUN glide install -RUN go build -a app . +RUN go build -o app . -ENTRYPOINT ["./app"] \ No newline at end of file +ENTRYPOINT ["./app"] diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..1949a53a90813eeb4dd4499fcd0ca9d00aa2a68c --- /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 9a87c08ae5d13849fe44600d05c6dc9d4dfc3654..0000000000000000000000000000000000000000 --- a/build.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -IMAGE=k8r.eu/justjanne/imghost -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 a3c11d01aa255bb85e7bb66cf0df5a7dac2eb77f..0000000000000000000000000000000000000000 --- a/deploy.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -IMAGE=k8r.eu/justjanne/imghost -TAGS=$(git describe --always --tags HEAD) -DEPLOYMENT=imghost-backend -POD=imghost-backend - -kubectl -n imghost 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 1da864db4f5185371cbf92d33fcfde0879cda56f..0000000000000000000000000000000000000000 --- a/glide.lock +++ /dev/null @@ -1,18 +0,0 @@ -hash: 2c515c806a97d3d8ec63b3c01acbedf214ae1b3750abd9f0b85f1e872412c236 -updated: 2019-02-04T16:43:09.961788302+01:00 -imports: -- name: github.com/go-redis/redis - version: 22be8a3eaf992c828cecb69dc07348313bf08d2e - subpackages: - - internal - - internal/consistenthash - - internal/hashtag - - internal/pool - - internal/proto - - internal/util -- name: gopkg.in/gographics/imagick.v2 - version: 589a8ef16fd4f08a29ad26afe5c33fb5673e4efc - subpackages: - - imagick - - imagick/types -testImports: [] diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index 026b466b56261d7315838c4ade202f89aee5ac6f..0000000000000000000000000000000000000000 --- a/glide.yaml +++ /dev/null @@ -1,8 +0,0 @@ -package: git.kuschku.de/justjanne/imghost -import: -- package: gopkg.in/gographics/imagick.v2 - version: ^2.5.0 - subpackages: - - imagick -- package: github.com/go-redis/redis - version: ^6.10.2 diff --git a/go.mod b/go.mod new file mode 100644 index 0000000000000000000000000000000000000000..d71540d9e3cb98322b7ae0257936d3c59bf0ad62 --- /dev/null +++ b/go.mod @@ -0,0 +1,10 @@ +module git.kuschku.de/justjanne/imghost + +go 1.13 + +require ( + github.com/go-redis/redis v6.15.6+incompatible + github.com/onsi/ginkgo v1.10.3 // indirect + github.com/onsi/gomega v1.7.1 // indirect + gopkg.in/gographics/imagick.v2 v2.5.0 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000000000000000000000000000000000000..4f12344eacf69372977cbdeca0eb6b68f01ee4d7 --- /dev/null +++ b/go.sum @@ -0,0 +1,31 @@ +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/go-redis/redis v6.15.6+incompatible h1:H9evprGPLI8+ci7fxQx6WNZHJSb7be8FqJQRhdQZ5Sg= +github.com/go-redis/redis v6.15.6+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= +github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.3 h1:OoxbjfXVZyod1fmWYhI7SEyaD8B00ynP3T+D5GiyHOY= +github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gographics/imagick.v2 v2.5.0 h1:3wOeg/IgtagJtveISUaX9A3F/L/5PxaFHkAz5AzgbgA= +gopkg.in/gographics/imagick.v2 v2.5.0/go.mod h1:of4TbGX8yMcpgWkWFjha7FsOFr+NjOJ5O1qtKU27Yj0= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=