Skip to content

Commit abf193b

Browse files
linuxgeminilinuxgemini
authored
Fix golangci and go latest
Update golangci-lint.yml Update golangci-lint.yml Update golangci-lint.yml Incorporate joohoi#294 Follow parts of joohoi#293 Make sure we're on latest go ver
1 parent 044b84b commit abf193b

File tree

7 files changed

+105
-106
lines changed

7 files changed

+105
-106
lines changed

‎.github/workflows/docker-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
if: github.event_name != 'pull_request'
4242
uses: sigstore/cosign-installer@main
4343
with:
44-
cosign-release: 'v1.5.1'
44+
cosign-release: 'v1.6.0'
4545

4646
- name: Set up QEMU
4747
uses: docker/setup-qemu-action@v1

‎.github/workflows/go_cov.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ jobs:
1414
name: Build and Unit Test
1515
runs-on: ubuntu-latest
1616
steps:
17-
- name: Set up Go
18-
uses: actions/setup-go@v2
17+
- name: Setup Go environment
18+
uses: actions/setup-go@v3.0.0
1919
with:
2020
go-version: ^1.13
21+
check-latest: true
2122

2223
- name: Check out code
2324
uses: actions/checkout@v2

‎.github/workflows/golangci-lint.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
schedule:
1212
# Run every 12 hours, at the 15 minute mark. E.g.
1313
# 2020-11-29 00:15:00 UTC, 2020-11-29 12:15:00 UTC, 2020-11-30 00:15:00 UTC
14-
- cron: '15 */12 * * *'
14+
- cron: "15 */12 * * *"
1515

1616
jobs:
1717
golangci:
@@ -22,7 +22,13 @@ jobs:
2222
- name: Check out code
2323
uses: actions/checkout@v2
2424

25+
- name: Setup Go environment
26+
uses: actions/[email protected]
27+
with:
28+
check-latest: true
29+
2530
- name: Run golangci-lint
26-
uses: golangci/golangci-lint-action@v2
31+
uses: golangci/golangci-lint-action@v3.1.0
2732
with:
28-
version: v1.35
33+
version: latest
34+
args: --timeout=3m

‎Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
FROM golang:1-alpine AS builder
22
LABEL maintainer="[email protected]"
33

4-
RUN apk add --update gcc musl-dev git
4+
RUN apk add -U --no-cache ca-certificates gcc musl-dev git
55

66
COPY . /tmp/acme-dns/
77

88
ENV GOPATH /tmp/buildcache
99
ENV CGO_ENABLED 1
10+
1011
WORKDIR /tmp/acme-dns
11-
RUN go build -ldflags="-extldflags=-static"
12+
13+
RUN go build -ldflags="-extldflags=-static" -tags sqlite_omit_load_extension
1214

1315
# assemble the release ready to copy to the image.
1416
RUN mkdir -p /tmp/release/bin
1517
RUN mkdir -p /tmp/release/etc/acme-dns
18+
RUN mkdir -p /tmp/release/etc/ssl/certs
1619
RUN mkdir -p /tmp/release/var/lib/acme-dns
1720
RUN cp /tmp/acme-dns/acme-dns /tmp/release/bin/acme-dns
21+
RUN cp /etc/ssl/certs/ca-certificates.crt /tmp/release/etc/ssl/certs/
1822

1923

2024
FROM gcr.io/distroless/static

‎go.mod

+42-25
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,56 @@
11
module github.com/linuxgemini/acme-dns
22

3-
go 1.16
3+
go 1.18
44

55
require (
6-
github.com/BurntSushi/toml v0.4.1
7-
github.com/DATA-DOG/go-sqlmock v1.5.0
8-
github.com/ajg/form v1.5.1 // indirect
9-
github.com/caddyserver/certmagic v0.15.2
10-
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5
11-
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 // indirect
12-
github.com/gavv/httpexpect v2.0.0+incompatible
6+
github.com/BurntSushi/toml v1.0.0
7+
github.com/caddyserver/certmagic v0.16.0
138
github.com/go-acme/lego/v3 v3.9.0
149
github.com/google/uuid v1.3.0
15-
github.com/gorilla/websocket v1.4.2 // indirect
16-
github.com/imkira/go-interpol v1.1.0 // indirect
1710
github.com/julienschmidt/httprouter v1.3.0
1811
github.com/lib/pq v1.10.4
19-
github.com/mattn/go-colorable v0.1.12 // indirect
20-
github.com/mattn/go-sqlite3 v1.14.10
21-
github.com/mholt/acmez v1.0.1
22-
github.com/miekg/dns v1.1.45
23-
github.com/moul/http2curl v1.0.0 // indirect
12+
github.com/mattn/go-sqlite3 v1.14.12
13+
github.com/mholt/acmez v1.0.2
14+
github.com/miekg/dns v1.1.48
2415
github.com/rs/cors v1.8.2
25-
github.com/sergi/go-diff v1.2.0 // indirect
2616
github.com/sirupsen/logrus v1.8.1
27-
github.com/valyala/fasthttp v1.31.0 // indirect
17+
golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29
18+
)
19+
20+
require (
21+
github.com/DATA-DOG/go-sqlmock v1.5.0 // indirect
22+
github.com/ajg/form v1.5.1 // indirect
23+
github.com/andybalholm/brotli v1.0.4 // indirect
24+
github.com/davecgh/go-spew v1.1.1 // indirect
25+
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect
26+
github.com/fatih/structs v1.1.0 // indirect
27+
github.com/gavv/httpexpect v2.0.0+incompatible // indirect
28+
github.com/google/go-querystring v1.0.0 // indirect
29+
github.com/gorilla/websocket v1.5.0 // indirect
30+
github.com/imkira/go-interpol v1.1.0 // indirect
31+
github.com/klauspost/compress v1.15.0 // indirect
32+
github.com/klauspost/cpuid/v2 v2.0.11 // indirect
33+
github.com/libdns/libdns v0.2.1 // indirect
34+
github.com/moul/http2curl v1.0.0 // indirect
35+
github.com/pmezard/go-difflib v1.0.0 // indirect
36+
github.com/sergi/go-diff v1.2.0 // indirect
37+
github.com/stretchr/testify v1.7.0 // indirect
38+
github.com/valyala/bytebufferpool v1.0.0 // indirect
39+
github.com/valyala/fasthttp v1.34.0 // indirect
40+
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
41+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
42+
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
2843
github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 // indirect
2944
github.com/yudai/gojsondiff v1.0.0 // indirect
3045
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
31-
github.com/yudai/pp v2.0.1+incompatible // indirect
32-
go.uber.org/atomic v1.9.0 // indirect
33-
go.uber.org/multierr v1.7.0 // indirect
34-
go.uber.org/zap v1.20.0 // indirect
35-
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
36-
golang.org/x/net v0.0.0-20220107192237-5cfca573fb4d // indirect
37-
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
38-
golang.org/x/tools v0.1.8 // indirect
46+
go.uber.org/atomic v1.7.0 // indirect
47+
go.uber.org/multierr v1.6.0 // indirect
48+
go.uber.org/zap v1.21.0 // indirect
49+
golang.org/x/mod v0.4.2 // indirect
50+
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
51+
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect
52+
golang.org/x/text v0.3.7 // indirect
53+
golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2 // indirect
54+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
55+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
3956
)

0 commit comments

Comments
 (0)