From 153b66ccfb13263c176d39b9c7fb532de5f5f306 Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Tue, 12 Nov 2019 14:50:06 +0100 Subject: [PATCH] Update dependencies --- Dockerfile | 14 ++++++-------- glide.lock | 17 ----------------- glide.yaml | 5 ----- go.mod | 10 ++++++++++ go.sum | 31 +++++++++++++++++++++++++++++++ 5 files changed, 47 insertions(+), 30 deletions(-) delete mode 100644 glide.lock delete mode 100644 glide.yaml create mode 100644 go.mod create mode 100644 go.sum diff --git a/Dockerfile b/Dockerfile index 2acd9e6..2af487e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,20 @@ FROM golang:alpine as go_builder -RUN apk add --no-cache curl git gcc musl-dev -RUN curl https://glide.sh/get | sh +RUN apk add --no-cache musl-dev WORKDIR /go/src/app -COPY glide.* ./ -RUN glide install -COPY *.go ./ -RUN CGO_ENABLED=false go build -a app . +COPY *.go go.* ./ +RUN go mod download +RUN CGO_ENABLED=false go build -o app . -FROM node:alpine as asset_builder +FROM node:10-alpine as asset_builder WORKDIR /app COPY package* /app/ RUN npm install COPY assets /app/assets RUN npm run build -FROM alpine:3.7 +FROM gcr.io/distroless/static WORKDIR / COPY --from=go_builder /go/src/app/app /app COPY templates /templates diff --git a/glide.lock b/glide.lock deleted file mode 100644 index 501120d..0000000 --- a/glide.lock +++ /dev/null @@ -1,17 +0,0 @@ -hash: 5a6dada4b3dcf477cce39070c5471b9d2c4eb6f84580715e945193716626dc83 -updated: 2019-02-04T16:57:53.586982387+01:00 -imports: -- name: github.com/go-redis/redis - version: 22be8a3eaf992c828cecb69dc07348313bf08d2e - subpackages: - - internal - - internal/consistenthash - - internal/hashtag - - internal/pool - - internal/proto - - internal/util -- name: github.com/lib/pq - version: 88edab0803230a3898347e77b474f8c1820a1f20 - subpackages: - - oid -testImports: [] diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index b99228e..0000000 --- a/glide.yaml +++ /dev/null @@ -1,5 +0,0 @@ -package: git.kuschku.de/justjanne/imghost-frontend -import: -- package: github.com/go-redis/redis - version: ^6.10.2 -- package: github.com/lib/pq diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..e3152ee --- /dev/null +++ b/go.mod @@ -0,0 +1,10 @@ +module git.kuschku.de/justjanne/imghost-frontend + +go 1.13 + +require ( + github.com/go-redis/redis v6.15.6+incompatible + github.com/lib/pq v1.2.0 + github.com/onsi/ginkgo v1.10.3 // indirect + github.com/onsi/gomega v1.7.1 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..a50552e --- /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/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= +github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +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/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= -- GitLab