From d024d524c05bf9854112d59d61c27e1f03c3e749 Mon Sep 17 00:00:00 2001 From: TP Honey Date: Wed, 20 Oct 2021 10:28:35 +0100 Subject: [PATCH 1/4] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6feac31..0ddb190 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@ A plugin to upload files to Jfrog artifactory. Build the plugin binary: -```text +```bash scripts/build.sh ``` Build the plugin image: -```text +```bash docker build -t plugins/artifactory -f docker/Dockerfile . ``` @@ -18,7 +18,7 @@ docker build -t plugins/artifactory -f docker/Dockerfile . Execute the plugin from your current working directory: -```text +```bash docker run --rm \ -e PLUGIN_USERNAME=foo \ -e PLUGIN_PASSWORD=bar \ @@ -27,4 +27,4 @@ docker run --rm \ -e PLUGIN_TARGET=/pcf \ -v $(pwd):/drone \ plugins/artifactory -``` \ No newline at end of file +``` From 674b4895691ccef431ed47c7e04884b7f0343517 Mon Sep 17 00:00:00 2001 From: TP Honey Date: Thu, 21 Oct 2021 14:07:10 +0100 Subject: [PATCH 2/4] Update main.go --- main.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main.go b/main.go index 74a9e2d..fe31eb8 100644 --- a/main.go +++ b/main.go @@ -35,8 +35,7 @@ func main() { } } -// default formatter that writes logs without including timestamp -// or level information. +// default formatter that writes logs without including timestamp or level information. type formatter struct {} func (*formatter) Format(entry *logrus.Entry) ([]byte, error) { return []byte(entry.Message), nil From ff5ec48f11b823578856b878fbdfc0831df532bb Mon Sep 17 00:00:00 2001 From: TP Honey Date: Mon, 13 Dec 2021 11:55:19 +0000 Subject: [PATCH 3/4] (maint) update alpine to 3.15, go to 1.17.5 --- .drone.yml | 2 +- docker/Dockerfile | 6 +++--- docker/Dockerfile.linux.arm | 6 +++--- docker/Dockerfile.linux.arm64 | 6 +++--- go.mod | 7 ++++++- go.sum | 3 +++ 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index f0fc485..69a18a9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,7 +4,7 @@ name: default steps: - name: build - image: golang + image: golang:1.17.5 commands: - go test ./... - sh scripts/build.sh diff --git a/docker/Dockerfile b/docker/Dockerfile index 6c5863c..4d5d00f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:3.12 as alpine +FROM alpine:3.15 as alpine RUN apk add -U --no-cache ca-certificates -FROM alpine:3.12 +FROM alpine:3.15 ENV GODEBUG netdns=go COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ @@ -15,4 +15,4 @@ RUN mv ./jfrog /usr/local/bin/ RUN chmod +x /usr/local/bin/jfrog ADD release/linux/amd64/plugin /bin/ -ENTRYPOINT ["/bin/plugin"] \ No newline at end of file +ENTRYPOINT ["/bin/plugin"] diff --git a/docker/Dockerfile.linux.arm b/docker/Dockerfile.linux.arm index 127f07c..d52f446 100644 --- a/docker/Dockerfile.linux.arm +++ b/docker/Dockerfile.linux.arm @@ -1,7 +1,7 @@ -FROM alpine:3.6 as alpine +FROM alpine:3.15 as alpine RUN apk add -U --no-cache ca-certificates -FROM alpine:3.6 +FROM alpine:3.15 ENV GODEBUG netdns=go COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ @@ -15,4 +15,4 @@ RUN mv ./jfrog /usr/local/bin/ RUN chmod +x /usr/local/bin/jfrog ADD release/linux/arm/plugin /bin/ -ENTRYPOINT ["/bin/plugin"] \ No newline at end of file +ENTRYPOINT ["/bin/plugin"] diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64 index 8482c37..75d83f6 100644 --- a/docker/Dockerfile.linux.arm64 +++ b/docker/Dockerfile.linux.arm64 @@ -1,7 +1,7 @@ -FROM alpine:3.6 as alpine +FROM alpine:3.15 as alpine RUN apk add -U --no-cache ca-certificates -FROM alpine:3.6 +FROM alpine:3.15 ENV GODEBUG netdns=go COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ @@ -15,4 +15,4 @@ RUN mv ./jfrog /usr/local/bin/ RUN chmod +x /usr/local/bin/jfrog ADD release/linux/arm64/plugin /bin/ -ENTRYPOINT ["/bin/plugin"] \ No newline at end of file +ENTRYPOINT ["/bin/plugin"] diff --git a/go.mod b/go.mod index 5c244c8..ad96be2 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,13 @@ module github.com/drone/drone-artifactory -go 1.12 +go 1.17 require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/sirupsen/logrus v1.4.2 ) + +require ( + github.com/konsorten/go-windows-terminal-sequences v1.0.1 // indirect + golang.org/x/sys v0.0.0-20190422165155-953cdadca894 // indirect +) diff --git a/go.sum b/go.sum index 282f96f..8bcbf9d 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,15 @@ +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8= github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From 5148358a9b04429756cf684f35bae5044ff6ea3d Mon Sep 17 00:00:00 2001 From: TP Honey Date: Wed, 15 Dec 2021 10:28:31 +0000 Subject: [PATCH 4/4] v1.0.3 release prep --- .github_changelog_generator | 2 ++ CHANGELOG.md | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 .github_changelog_generator create mode 100644 CHANGELOG.md diff --git a/.github_changelog_generator b/.github_changelog_generator new file mode 100644 index 0000000..76e9526 --- /dev/null +++ b/.github_changelog_generator @@ -0,0 +1,2 @@ +since-tag=v1.0.2 + diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..cac5d7b --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,14 @@ +# Changelog + +## [v1.0.3](https://github.com/harness/drone-artifactory/tree/v1.0.3) (2021-12-15) + +[Full Changelog](https://github.com/harness/drone-artifactory/compare/v1.0.2...v1.0.3) + +**Merged pull requests:** + +- \(maint\) update alpine to 3.15, go to 1.17.5 [\#8](https://github.com/harness/drone-artifactory/pull/8) ([tphoney](https://github.com/tphoney)) +- Update README.md [\#6](https://github.com/harness/drone-artifactory/pull/6) ([tphoney](https://github.com/tphoney)) + + + +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*