Merge pull request #8 from utilitywarehouse/update

Update all deps

.github/workflows/build.yaml

@@ -0,0 +1,46 @@
+name: build
+
+on:
+  push:
+    branches:
+      - "*"
+    tags:
+      - "v*"
+  pull_request:
+    branches:
+      - "master"
+
+env:
+  REGISTRY: quay.io
+  IMAGE_NAME: utilitywarehouse/cockroach-cfssl-certs
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to Quay.io Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: quay.io
+          username: utilitywarehouse+drone_ci
+          password: ${{ secrets.SYSTEM_QUAY_TOKEN }}
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -18,3 +18,6 @@ cockroach-certs
 *.crt
 *.key
 *.pem
+
+# Build version
+version.txt

Dockerfile

@@ -1,20 +1,13 @@
-# -
-# Build workspace
-# -
-FROM golang:1.11 AS compile
-
-RUN apt-get update -y && \
-    apt-get install --no-install-recommends -y -q build-essential ca-certificates
+FROM golang:1.20-alpine AS compile
 
 WORKDIR /build
-ADD . .
-RUN make install
-RUN make static
+COPY . .
+RUN apk --no-cache add git \
+      && go get -d -v ./... \
+      && go generate \
+      && CGO_ENABLED=0 go build -o=cockroach-certs .
 
-# -
-# Runtime
-# -
-FROM alpine:3.8 AS runtime
+FROM alpine:3.17 AS runtime
 
 COPY --from=compile /build/cockroach-certs /bin/cockroach-certs
 COPY --from=compile /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt

README.md

@@ -1,5 +1,5 @@
-# cockroach-cfssl-certs [![CircleCI](https://circleci.com/gh/utilitywarehouse/docker-cockroach-cfssl-certs.svg?style=svg&circle-token=d220b3fb97a38ee8321d564e9e4443dd858650c5)](https://circleci.com/gh/utilitywarehouse/docker-cockroach-cfssl-certs)
-Utility to get ssl certificates for cockroach nodes and clients from cfssl CA.
+# cockroach-cfssl-certs 
+Utility to get TLS certificates for cockroach nodes and clients from cfssl CA.
 It is inspired by a similar tool that uses Kubernetes CA from
 [cockroach](https://github.com/cockroachdb/k8s/tree/master/request-cert).
 
@@ -79,4 +79,4 @@ used as a common name in the certificate.
     volumeMounts:
     - name: certs
       mountPath: /cockroach-certs
-```
+```

get_version

@@ -0,0 +1,2 @@
+#!/bin/bash
+git rev-parse HEAD > version.txt

go.mod

@@ -1,21 +1,34 @@
 module github.com/utilitywarehouse/docker-cockroach-cfssl-certs
 
-go 1.15
+go 1.20
 
 require (
-	github.com/cloudflare/cfssl v0.0.0-20180829183926-33259b0d2131
-	github.com/go-sql-driver/mysql v1.4.0 // indirect
-	github.com/golang/protobuf v1.2.0 // indirect
-	github.com/google/certificate-transparency-go v1.0.21 // indirect
-	github.com/jmoiron/sqlx v0.0.0-20180614180643-0dae4fefe7c0 // indirect
-	github.com/kisielk/sqlstruct v0.0.0-20150923205031-648daed35d49 // indirect
-	github.com/lib/pq v1.0.0 // indirect
-	github.com/mattn/go-sqlite3 v1.9.0 // indirect
-	github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936
-	github.com/pkg/errors v0.8.0
-	github.com/urfave/cli v1.20.0
-	golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b // indirect
-	golang.org/x/net v0.0.0-20180906233101-161cd47e91fd // indirect
-	golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f // indirect
-	google.golang.org/appengine v1.1.0 // indirect
+	github.com/cloudflare/cfssl v1.6.3
+	github.com/mitchellh/go-ps v1.0.0
+	github.com/pkg/errors v0.9.1
+	github.com/urfave/cli v1.22.12
+)
+
+require (
+	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-sql-driver/mysql v1.6.0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/certificate-transparency-go v1.1.4 // indirect
+	github.com/jmoiron/sqlx v1.3.5 // indirect
+	github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46 // indirect
+	github.com/lib/pq v1.10.1 // indirect
+	github.com/mattn/go-sqlite3 v1.14.15 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/weppos/publicsuffix-go v0.20.0 // indirect
+	github.com/zmap/zcrypto v0.0.0-20230205235340-d51ce4775101 // indirect
+	github.com/zmap/zlint/v3 v3.4.1 // indirect
+	golang.org/x/crypto v0.5.0 // indirect
+	golang.org/x/net v0.5.0 // indirect
+	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
+	golang.org/x/text v0.6.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	k8s.io/klog/v2 v2.90.0 // indirect
 )