diff --git a/.drone.yml b/.drone.yml index 069fb6e..1d66719 100644 --- a/.drone.yml +++ b/.drone.yml @@ -96,20 +96,6 @@ type: docker name: manifest steps: - - name: publish-version - image: plugins/manifest - settings: - ignore_missing: true - target: spcodes/morty:v0.2.0 - template: spcodes/morty:OS-ARCH - platforms: - - linux/amd64 - - linux/arm64 - - linux/arm - username: - from_secret: USERNAME - password: - from_secret: PASSWORD - name: publish-latest image: plugins/manifest settings: diff --git a/Dockerfile b/Dockerfile index 8f56448..5a50060 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,12 +6,13 @@ FROM arm32v7/golang:1.15.7-alpine3.12@sha256:d54bff25a171d1b3036bf6b5dea2bbfaf75 FROM arm64v8/golang:1.15.7-alpine3.12@sha256:e5389316a6dc295d6c0ca269c39124ad5bc9ebb416c71c810822cf6fbcf8ff01 AS builder-arm64 FROM builder-${ARCH} AS builder -ENV MORTY_VERSION="v0.2.0" +ENV MORTY_VERSION="4021e4369d6f62690474991a9b6901b751b940d5" WORKDIR $GOPATH/src/github.com/asciimoo/morty -RUN apk add --no-cache tar="1.32-r1" git="2.26.2-r0" curl="7.69.1-r3" \ - && curl -L "https://github.com/asciimoo/morty/archive/${MORTY_VERSION}.tar.gz" | tar xvz --strip 1 +RUN apk add --no-cache git="2.26.2-r0" \ + && git clone https://github.com/asciimoo/morty.git . \ + && git checkout "${MORTY_VERSION}" RUN go get -d -v && gofmt -l ./ && go build . diff --git a/renovate.json b/renovate.json index 381f78f..118186f 100644 --- a/renovate.json +++ b/renovate.json @@ -10,16 +10,14 @@ "regexManagers": [ { "fileMatch": [ - "^Dockerfile$", - "^.drone.yml$" + "^Dockerfile$" ], "matchStrings": [ - "\\s+ENV\\s*MORTY_VERSION=\"(?.*?)\"\\s+", - "\\s+target:\\s*spcodes\\/morty:(?.*?)\\s+" + "\\s+ENV\\s*MORTY_VERSION=\"(?.*?)\"\\s+" ], "versioningTemplate": "loose", - "depNameTemplate": "asciimoo/morty", - "datasourceTemplate": "github-tags" + "lookupNameTemplate": "https://github.com/asciimoo/morty.git", + "datasourceTemplate": "git-refs" }, { "fileMatch": [