Build x86 and ARM containers, using modern golang version.

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+ - package-ecosystem: "gomod"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ open-pull-requests-limit: 20
+ rebase-strategy: "disabled"
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "daily"

.github/workflows/docker.yml

@@ -8,6 +8,10 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Check out code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
+ - name: Set up QEMU
+ uses: docker/setup-qemu-action@v3
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v3
  - name: Build
  run: make docker_build

.github/workflows/go.yml

@@ -8,11 +8,11 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Set up Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v5
  with:
- go-version: '1.16'
+ go-version: '1.21'
  - name: Check out code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
  - name: Check go fmt has been run
  run: |
  echo 'Check if go fmt has been run'

Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/fydrah/golang:1.17-alpine3.13 AS build
+FROM golang:1.21-alpine AS build
 ARG REPO=github.com/fydrah/loginapp
 
 RUN apk add --no-cache git build-base

Makefile

@@ -17,7 +17,7 @@ PACKR_VERSION := $(shell awk '/packr/ {sub(/^[ \t]+/,""); print $$2}' go.mod)
 DOCKERFILE := Dockerfile
 DOCKER_REPOSITORY := quay.io/fydrah/loginapp
 DOCKER_BIN := $(shell which docker || which podman || echo "docker")
-DOCKER_BUILD := $(DOCKER_BIN) build -f $(DOCKERFILE) .
+DOCKER_BUILD := $(DOCKER_BIN) buildx build --platform linux/amd64,linux/arm64 -f $(DOCKERFILE) .
 
 # Helm
 HELM_LOGINAPP_REPO := https://storage.googleapis.com/loginapp-releases/charts

go.mod

@@ -1,30 +1,59 @@
 module github.com/fydrah/loginapp
 
-go 1.15
+go 1.21
 
 require (
  github.com/cenkalti/backoff v2.2.1+incompatible
- github.com/cespare/xxhash/v2 v2.1.2 // indirect
  github.com/coreos/go-oidc v2.2.1+incompatible
- github.com/fsnotify/fsnotify v1.5.1
- github.com/gobuffalo/logger v1.0.4 // indirect
- github.com/gobuffalo/packr/v2 v2.8.1
+ github.com/fsnotify/fsnotify v1.7.0
+ github.com/gobuffalo/packr/v2 v2.8.3
  github.com/julienschmidt/httprouter v1.3.0
- github.com/karrick/godirwalk v1.16.1 // indirect
  github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c
- github.com/pquerna/cachecontrol v0.1.0 // indirect
- github.com/prometheus/client_golang v1.11.0
- github.com/prometheus/common v0.31.1 // indirect
- github.com/prometheus/procfs v0.7.3 // indirect
- github.com/sirupsen/logrus v1.8.1
- github.com/spf13/cobra v1.2.1
+ github.com/prometheus/client_golang v1.18.0
+ github.com/sirupsen/logrus v1.9.3
+ github.com/spf13/cobra v1.8.0
  github.com/spf13/pflag v1.0.5
- github.com/spf13/viper v1.9.0
- golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
- golang.org/x/net v0.0.0-20211007125505-59d4e928ea9d // indirect
- golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1
- golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac // indirect
- golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
- golang.org/x/text v0.3.7 // indirect
+ github.com/spf13/viper v1.18.2
+ golang.org/x/oauth2 v0.16.0
+)
+
+require (
+ github.com/beorn7/perks v1.0.1 // indirect
+ github.com/cespare/xxhash/v2 v2.2.0 // indirect
+ github.com/gobuffalo/logger v1.0.6 // indirect
+ github.com/gobuffalo/packd v1.0.1 // indirect
+ github.com/golang/protobuf v1.5.3 // indirect
+ github.com/hashicorp/hcl v1.0.0 // indirect
+ github.com/inconshreveable/mousetrap v1.1.0 // indirect
+ github.com/karrick/godirwalk v1.16.1 // indirect
+ github.com/magiconair/properties v1.8.7 // indirect
+ github.com/markbates/errx v1.1.0 // indirect
+ github.com/markbates/oncer v1.0.0 // indirect
+ github.com/markbates/safe v1.0.1 // indirect
+ github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
+ github.com/mitchellh/mapstructure v1.5.0 // indirect
+ github.com/pelletier/go-toml/v2 v2.1.0 // indirect
+ github.com/pquerna/cachecontrol v0.2.0 // indirect
+ github.com/prometheus/client_model v0.5.0 // indirect
+ github.com/prometheus/common v0.45.0 // indirect
+ github.com/prometheus/procfs v0.12.0 // indirect
+ github.com/sagikazarmark/locafero v0.4.0 // indirect
+ github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+ github.com/sourcegraph/conc v0.3.0 // indirect
+ github.com/spf13/afero v1.11.0 // indirect
+ github.com/spf13/cast v1.6.0 // indirect
+ github.com/subosito/gotenv v1.6.0 // indirect
+ go.uber.org/atomic v1.9.0 // indirect
+ go.uber.org/multierr v1.9.0 // indirect
+ golang.org/x/crypto v0.18.0 // indirect
+ golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+ golang.org/x/net v0.20.0 // indirect
+ golang.org/x/sys v0.16.0 // indirect
+ golang.org/x/term v0.16.0 // indirect
+ golang.org/x/text v0.14.0 // indirect
+ google.golang.org/appengine v1.6.7 // indirect
+ google.golang.org/protobuf v1.31.0 // indirect
+ gopkg.in/ini.v1 v1.67.0 // indirect
  gopkg.in/square/go-jose.v2 v2.6.0 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
 )