Skip to content

Commit 01f689f

Browse files
authored
Revert "chore/fix: switch release pipeline to goreleaser & ghcr.io (#40)" (#42)
This reverts commit b56a421.
1 parent b56a421 commit 01f689f

7 files changed

Lines changed: 99 additions & 54 deletions

File tree

.github/workflows/docker.yml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# https://github.com/marketplace/actions/build-and-push-docker-images#git-context
2+
name: docker
3+
4+
5+
on:
6+
push:
7+
branches:
8+
- 'master'
9+
tags:
10+
- 'v*'
11+
pull_request:
12+
branches:
13+
- 'master'
14+
15+
jobs:
16+
docker:
17+
runs-on: ubuntu-latest
18+
steps:
19+
-
20+
name: Checkout
21+
uses: actions/checkout@v2
22+
-
23+
name: Set up QEMU
24+
uses: docker/setup-qemu-action@v1
25+
-
26+
name: Set up Docker Buildx
27+
uses: docker/setup-buildx-action@v1
28+
-
29+
name: Docker meta
30+
id: meta
31+
uses: docker/metadata-action@v3
32+
with:
33+
images: jsonnetlibs/docsonnet
34+
tags: |
35+
type=ref,event=branch
36+
type=ref,event=pr
37+
type=semver,pattern={{version}}
38+
type=semver,pattern={{major}}.{{minor}}
39+
-
40+
if: ${{ github.repository == 'jsonnet-libs/docsonnet' }}
41+
name: Login to DockerHub
42+
uses: docker/login-action@v1
43+
with:
44+
username: ${{ secrets.DOCKERHUB_USERNAME }}
45+
password: ${{ secrets.DOCKERHUB_TOKEN }}
46+
-
47+
name: Build and push
48+
id: docker_build
49+
uses: docker/build-push-action@v2
50+
with:
51+
context: .
52+
push: ${{ github.event_name != 'pull_request' && github.repository == 'jsonnet-libs/docsonnet' }}
53+
tags: ${{ steps.meta.outputs.tags }}
54+
labels: ${{ steps.meta.outputs.labels }}
55+
-
56+
name: Image digest
57+
run: echo ${{ steps.docker_build.outputs.digest }}

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
dist
21
docsonnet

.goreleaser.yaml

Lines changed: 0 additions & 35 deletions
This file was deleted.

Dockerfile

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
FROM --platform=$BUILDPLATFORM golang:1.16.4 as base
2+
3+
ENV GO111MODULE=on
4+
WORKDIR /app
5+
6+
COPY go.mod .
7+
COPY go.sum .
8+
9+
RUN go mod download
10+
11+
COPY . .
12+
13+
FROM base AS builder
14+
15+
ENV GOARCH=$TARGETARCH
16+
RUN CGO_ENABLED=0 go build -ldflags='-s -w -extldflags "-static"' .
17+
118
FROM alpine:3.12
2-
ENTRYPOINT ["/usr/bin/docsonnet"]
3-
COPY docsonnet /usr/bin/docsonnet
19+
COPY --from=builder /app/docsonnet /usr/local/bin
20+
21+
ENTRYPOINT ["docsonnet"]

Makefile

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
1-
.PHONY: build release docs
1+
.PHONY: build test push push-image docs
2+
3+
IMAGE_NAME ?= docsonnet
4+
IMAGE_PREFIX ?= jsonnetlibs
5+
IMAGE_TAG ?= 0.0.4
26

37
build:
4-
goreleaser build --rm-dist --snapshot
8+
docker buildx build -t $(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG) .
9+
10+
test: build
11+
12+
push: build test push-image
513

6-
release:
7-
goreleaser release --rm-dist
14+
push-image:
15+
docker push $(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG)
16+
docker push $(IMAGE_PREFIX)/$(IMAGE_NAME):latest
817

918
docs:
1019
jsonnet -S -c -m doc-util/ \

go.mod

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/jsonnet-libs/docsonnet
22

3-
go 1.19
3+
go 1.16
44

55
require (
66
github.com/go-clix/cli v0.1.2-0.20200502172020-b8f4629e879a
@@ -10,14 +10,3 @@ require (
1010
github.com/stretchr/testify v1.4.0
1111
gopkg.in/yaml.v2 v2.2.7
1212
)
13-
14-
require (
15-
github.com/davecgh/go-spew v1.1.1 // indirect
16-
github.com/gobuffalo/here v0.6.0 // indirect
17-
github.com/hashicorp/errwrap v1.0.0 // indirect
18-
github.com/hashicorp/go-multierror v1.0.0 // indirect
19-
github.com/pmezard/go-difflib v1.0.0 // indirect
20-
github.com/posener/complete v1.2.3 // indirect
21-
github.com/spf13/pflag v1.0.5 // indirect
22-
sigs.k8s.io/yaml v1.1.0 // indirect
23-
)

go.sum

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
22
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
33
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4+
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
45
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
56
github.com/go-clix/cli v0.1.2-0.20200502172020-b8f4629e879a h1:nh+UOawbjKgiUAJAgi8JHctNebEu6mjwDXsv8Xdln8w=
67
github.com/go-clix/cli v0.1.2-0.20200502172020-b8f4629e879a/go.mod h1:dYJevXraB9mXZFhz5clyQestG0qGcmT5rRC/P9etoRQ=
78
github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI=
89
github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
910
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
1011
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
12+
github.com/google/go-jsonnet v0.15.1-0.20200415122941-8a0084e64395 h1:PftVLaNFPyiHId46033ADWFgXAWIwSDK9ESNRIKdj1Q=
13+
github.com/google/go-jsonnet v0.15.1-0.20200415122941-8a0084e64395/go.mod h1:sOcuej3UW1vpPTZOr8L7RQimqai1a57bt5j22LzGZCw=
1114
github.com/google/go-jsonnet v0.18.0 h1:/6pTy6g+Jh1a1I2UMoAODkqELFiVIdOxbNwv0DDzoOg=
1215
github.com/google/go-jsonnet v0.18.0/go.mod h1:C3fTzyVJDslXdiTqw/bTFk7vSGyCtH3MGRbDfvEwGd0=
1316
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
@@ -21,7 +24,10 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
2124
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
2225
github.com/markbates/pkger v0.15.1 h1:3MPelV53RnGSW07izx5xGxl4e/sdRD6zqseIk0rMASY=
2326
github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
27+
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
2428
github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
29+
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
30+
github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
2531
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
2632
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2733
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -34,6 +40,8 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
3440
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
3541
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
3642
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
43+
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
44+
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3745
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3846
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3947
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=

0 commit comments

Comments
 (0)