Skip to content

Commit

Permalink
Fix golangci and go latest
Browse files Browse the repository at this point in the history
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
  • Loading branch information
linuxgemini authored Apr 3, 2022
1 parent 044b84b commit abf193b
Show file tree
Hide file tree
Showing 7 changed files with 105 additions and 106 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
if: github.event_name != 'pull_request'
uses: sigstore/cosign-installer@main
with:
cosign-release: 'v1.5.1'
cosign-release: 'v1.6.0'

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/go_cov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ jobs:
name: Build and Unit Test
runs-on: ubuntu-latest
steps:
- name: Set up Go
uses: actions/setup-go@v2
- name: Setup Go environment
uses: actions/setup-go@v3.0.0
with:
go-version: ^1.13
check-latest: true

- name: Check out code
uses: actions/checkout@v2
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
schedule:
# Run every 12 hours, at the 15 minute mark. E.g.
# 2020-11-29 00:15:00 UTC, 2020-11-29 12:15:00 UTC, 2020-11-30 00:15:00 UTC
- cron: '15 */12 * * *'
- cron: "15 */12 * * *"

jobs:
golangci:
Expand All @@ -22,7 +22,13 @@ jobs:
- name: Check out code
uses: actions/checkout@v2

- name: Setup Go environment
uses: actions/[email protected]
with:
check-latest: true

- name: Run golangci-lint
uses: golangci/golangci-lint-action@v2
uses: golangci/golangci-lint-action@v3.1.0
with:
version: v1.35
version: latest
args: --timeout=3m
8 changes: 6 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
FROM golang:1-alpine AS builder
LABEL maintainer="[email protected]"

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

COPY . /tmp/acme-dns/

ENV GOPATH /tmp/buildcache
ENV CGO_ENABLED 1

WORKDIR /tmp/acme-dns
RUN go build -ldflags="-extldflags=-static"

RUN go build -ldflags="-extldflags=-static" -tags sqlite_omit_load_extension

# assemble the release ready to copy to the image.
RUN mkdir -p /tmp/release/bin
RUN mkdir -p /tmp/release/etc/acme-dns
RUN mkdir -p /tmp/release/etc/ssl/certs
RUN mkdir -p /tmp/release/var/lib/acme-dns
RUN cp /tmp/acme-dns/acme-dns /tmp/release/bin/acme-dns
RUN cp /etc/ssl/certs/ca-certificates.crt /tmp/release/etc/ssl/certs/


FROM gcr.io/distroless/static
Expand Down
67 changes: 42 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,39 +1,56 @@
module github.com/linuxgemini/acme-dns

go 1.16
go 1.18

require (
github.com/BurntSushi/toml v0.4.1
github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/ajg/form v1.5.1 // indirect
github.com/caddyserver/certmagic v0.15.2
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 // indirect
github.com/gavv/httpexpect v2.0.0+incompatible
github.com/BurntSushi/toml v1.0.0
github.com/caddyserver/certmagic v0.16.0
github.com/go-acme/lego/v3 v3.9.0
github.com/google/uuid v1.3.0
github.com/gorilla/websocket v1.4.2 // indirect
github.com/imkira/go-interpol v1.1.0 // indirect
github.com/julienschmidt/httprouter v1.3.0
github.com/lib/pq v1.10.4
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-sqlite3 v1.14.10
github.com/mholt/acmez v1.0.1
github.com/miekg/dns v1.1.45
github.com/moul/http2curl v1.0.0 // indirect
github.com/mattn/go-sqlite3 v1.14.12
github.com/mholt/acmez v1.0.2
github.com/miekg/dns v1.1.48
github.com/rs/cors v1.8.2
github.com/sergi/go-diff v1.2.0 // indirect
github.com/sirupsen/logrus v1.8.1
github.com/valyala/fasthttp v1.31.0 // indirect
golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29
)

require (
github.com/DATA-DOG/go-sqlmock v1.5.0 // indirect
github.com/ajg/form v1.5.1 // indirect
github.com/andybalholm/brotli v1.0.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/gavv/httpexpect v2.0.0+incompatible // indirect
github.com/google/go-querystring v1.0.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/imkira/go-interpol v1.1.0 // indirect
github.com/klauspost/compress v1.15.0 // indirect
github.com/klauspost/cpuid/v2 v2.0.11 // indirect
github.com/libdns/libdns v0.2.1 // indirect
github.com/moul/http2curl v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/sergi/go-diff v1.2.0 // indirect
github.com/stretchr/testify v1.7.0 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasthttp v1.34.0 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 // indirect
github.com/yudai/gojsondiff v1.0.0 // indirect
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
github.com/yudai/pp v2.0.1+incompatible // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.7.0 // indirect
go.uber.org/zap v1.20.0 // indirect
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
golang.org/x/net v0.0.0-20220107192237-5cfca573fb4d // indirect
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
golang.org/x/tools v0.1.8 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/mod v0.4.2 // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)
Loading

0 comments on commit abf193b

Please sign in to comment.