Skip to content

Commit

Permalink
Bump go, alpine and deps. New version 0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
roman-vynar committed Apr 17, 2024
1 parent 6449895 commit 5222f47
Show file tree
Hide file tree
Showing 9 changed files with 112 additions and 596 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
.DS_Store
dev_config/
dev.Makefile
webauthn_proxy
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
## Changelog

### 0.1 (2024-04-17)

* Upgrade Go version to 1.22.2, alpine to 3.19 and other dependencies.
* Disable unnecessary 1Password auto-filling.

### 0.0.4 (2023-02-22)

* Upgrade Go version to 1.19.6, alpine to 3.16 and other dependencies.
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM golang:1.19.6-alpine3.16 as builder
FROM golang:1.22.2-alpine3.19 as builder

WORKDIR /opt/src
ADD . /opt/src
RUN go build -o /opt/webauthn_proxy .


FROM alpine:3.16
FROM alpine:3.19

WORKDIR /opt
ADD config /opt/config
Expand Down
16 changes: 13 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
IMAGE=quiq/webauthn_proxy
VERSION=`sed -n '/version/ s/.* = //;s/"//g p' version.go`
NOCACHE=--no-cache

.DEFAULT: buildx
.DEFAULT_GOAL := dummy

buildx:
@docker buildx build --platform linux/amd64,linux/arm64 -t ${IMAGE}:${VERSION} -t ${IMAGE}:latest --push .
dummy:
@echo "Nothing to do here."

build:
docker build ${NOCACHE} -t ${IMAGE}:${VERSION} .

public:
docker buildx build ${NOCACHE} --platform linux/amd64,linux/arm64 -t ${IMAGE}:${VERSION} -t ${IMAGE}:latest --push .

test:
docker buildx build ${NOCACHE} --platform linux/arm64 -t docker.quiq.sh/webauthn_proxy:test --push .
44 changes: 25 additions & 19 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,34 +1,40 @@
module github.com/Quiq/webauthn_proxy

go 1.19
go 1.21

toolchain go1.22.2

require (
github.com/go-webauthn/webauthn v0.8.1
github.com/gorilla/sessions v1.2.1
github.com/sirupsen/logrus v1.9.0
github.com/spf13/viper v1.15.0
github.com/go-webauthn/webauthn v0.10.2
github.com/gorilla/sessions v1.2.2
github.com/sirupsen/logrus v1.9.3
github.com/spf13/viper v1.18.2
)

require (
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
github.com/go-webauthn/revoke v0.1.9 // indirect
github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
github.com/google/go-tpm v0.3.3 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/securecookie v1.1.1 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.6.0 // indirect
github.com/go-webauthn/x v0.1.9 // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
github.com/google/go-tpm v0.9.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/securecookie v1.1.2 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/spf13/afero v1.9.3 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.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/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/sys v0.15.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
632 changes: 64 additions & 568 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<table>
<tr>
<td>Authenticate:</td>
<td><input type="text" name="username" id="username" size="30" autocomplete="off" /></td>
<td><input type="text" name="username" id="username" size="30" autocomplete="off" data-1p-ignore /></td>
<td><button id="loginButton">Login</button></td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion static/register.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<table>
<tr>
<td>Username:</td>
<td><input type="text" name="username" id="username" size="30" autocomplete="off" /></td>
<td><input type="text" name="username" id="username" size="30" autocomplete="off" data-1p-ignore /></td>
<td><button id="registerButton">Register</button></td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion version.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package main

const (
version = "0.0.4"
version = "0.1"
)

0 comments on commit 5222f47

Please sign in to comment.