From 81f873d2de1a76f1547c403fbd81d9e92c90599c Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Sun, 12 May 2019 13:46:39 +0100 Subject: [PATCH] feat: docker images License: MIT Signed-off-by: Henrique Dias --- .circleci/config.yml | 3 +++ .goreleaser.yml | 24 ++++++++++++++++++------ Dockerfile | 11 +++++++++++ cmd/webdav/main.go | 1 - 4 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 Dockerfile diff --git a/.circleci/config.yml b/.circleci/config.yml index e1c40ed..9fed938 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,10 @@ jobs: - image: circleci/golang:1.12 steps: - checkout + - setup_remote_docker + - run: docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - run: curl -sL https://git.io/goreleaser | bash + - run: docker logout workflows: version: 2 build-workflow: diff --git a/.goreleaser.yml b/.goreleaser.yml index 8e06f36..7c0bd52 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -21,9 +21,21 @@ build: goarch: arm goarm: 6 -archive: - name_template: "{{.Os}}-{{.Arch}}-{{ .ProjectName }}" - format: tar.gz - format_overrides: - - goos: windows - format: zip \ No newline at end of file +archives: + - + name_template: "{{.Os}}-{{.Arch}}-{{ .ProjectName }}" + format: tar.gz + format_overrides: + - goos: windows + format: zip + +dockers: + - + goos: linux + goarch: amd64 + goarm: '' + image_templates: + - "hacdias/webdav:latest" + - "hacdias/webdav:{{ .Tag }}" + - "hacdias/webdav:v{{ .Major }}.{{ .Minor }}" + - "hacdias/webdav:v{{ .Major }}" diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..56d309c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ +FROM alpine:latest as certs +RUN apk --update add ca-certificates + +FROM scratch +COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt + +EXPOSE 80 + +COPY webdav /webdav + +ENTRYPOINT [ "/webdav" ] diff --git a/cmd/webdav/main.go b/cmd/webdav/main.go index 44365c6..e40803b 100644 --- a/cmd/webdav/main.go +++ b/cmd/webdav/main.go @@ -262,7 +262,6 @@ func basicAuth(c *cfg) http.Handler { } func checkPassword(saved, input string) bool { - if strings.HasPrefix(saved, "{bcrypt}") { savedPassword := strings.TrimPrefix(saved, "{bcrypt}") return bcrypt.CompareHashAndPassword([]byte(savedPassword), []byte(input)) == nil