From 6a0f0e64dfa1d146bb2017763f4d5d15f4f2b472 Mon Sep 17 00:00:00 2001 From: Michael Arndt Date: Tue, 15 Jul 2025 16:01:54 +0200 Subject: [PATCH 1/8] bump to go 1.24.5 --- builder/Dockerfile | 19 ------------------- builder2/Dockerfile | 33 +++++++++------------------------ 2 files changed, 9 insertions(+), 43 deletions(-) delete mode 100644 builder/Dockerfile diff --git a/builder/Dockerfile b/builder/Dockerfile deleted file mode 100644 index cd31a07..0000000 --- a/builder/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM circleci/golang:1.11.2 - -RUN sudo apt-get update && sudo apt-get install -y \ - libgtk-3-dev \ - libpcsclite-dev \ - libudev-dev \ - libusb-1.0-0-dev \ -&& sudo rm -rf /var/lib/apt/lists/* - -RUN go get -u github.com/tcnksm/ghr \ - && go get -u github.com/stevenmatthewt/semantics - -RUN curl -L -s https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 -o /go/bin/dep \ - && chmod +x /go/bin/dep - -RUN mkdir -p /go/src/github.com/mitchellh/gox -RUN git clone --branch master https://github.com/mitchellh/gox.git /go/src/github.com/mitchellh/gox -RUN cd /go/src/github.com/mitchellh/gox && git reset --hard 9cc487598128d0963ff9dcc51176e722788ec645 -RUN cd /go/src/github.com/mitchellh/gox && dep ensure && go install -v ./... diff --git a/builder2/Dockerfile b/builder2/Dockerfile index 1a6961c..e662b89 100644 --- a/builder2/Dockerfile +++ b/builder2/Dockerfile @@ -1,26 +1,11 @@ -FROM fedora:36 +FROM cimg/go:1.24.5 -RUN dnf install -y \ - findutils \ - git \ - golang \ - gtk3-devel \ - libudev-devel \ - libusbx-devel \ - mingw32-gcc \ - mingw64-gcc \ - mingw32-gcc-c++ \ - mingw32-glib2 \ - mingw32-gtk3 \ - mingw32-libusbx \ - mingw64-gcc-c++ \ - mingw64-glib2 \ - mingw64-gtk3 \ - mingw64-libusbx \ - pcsc-lite-devel \ - zip \ - && \ - dnf clean all +RUN sudo apt-get update && sudo apt-get install -y \ + libgtk-3-dev \ + libpcsclite-dev \ + libudev-dev \ + libusb-1.0-0-dev \ +&& sudo rm -rf /var/lib/apt/lists/* ENV GOPATH /go ENV GOCACHE /go/.cache @@ -30,8 +15,8 @@ ENV PATH "$PATH:$GOPATH/bin" RUN mkdir /go RUN chmod a+rwx /go -RUN go install github.com/tcnksm/ghr@v0.15.0 -RUN go install github.com/stevenmatthewt/semantics@latest +RUN go install github.com/tcnksm/ghr@v0.17.0 +RUN go install github.com/stevenmatthewt/semantics@v2.0.4 # CGO_LDFLAGS_ALLOW='.*' CGO_CFLAGS_ALLOW='.*' CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ CGO_ENABLED=1 GOOS=windows GOARCH=amd64 PKG_CONFIG_PATH=/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig go build -v github.com/MeneDev/yubi-oath-vpn/cmd/yubi-oath-vpn # cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/{libatk-1.0-0.dll,libbz2-1.dll,libcairo-2.dll,libcairo-gobject-2.dll,libepoxy-0.dll,libexpat-1.dll,libffi-6.dll,libfontconfig-1.dll,libfreetype-6.dll,libgcc_s_seh-1.dll,libgdk-3-0.dll,libgdk_pixbuf-2.0-0.dll,libgio-2.0-0.dll,libgit2.dll,libglib-2.0-0.dll,libgmodule-2.0-0.dll,libgobject-2.0-0.dll,libgraphite2.dll,libgtk-3-0.dll,libharfbuzz-0.dll,libiconv-2.dll,libintl-8.dll,libjasper-1.dll,libjpeg-8.dll,libpango-1.0-0.dll,libpangocairo-1.0-0.dll,libpangoft2-1.0-0.dll,libpangowin32-1.0-0.dll,libpcre-1.dll,libpixman-1-0.dll,libpng16-16.dll,libstdc++-6.dll,libwinpthread-1.dll,zlib1.dll} /go/src/github.com/MeneDev/yubi-oath-vpn/release From 8727c3f3676c440ad34114c31b0b5c66ad1cb772 Mon Sep 17 00:00:00 2001 From: Michael Arndt Date: Tue, 15 Jul 2025 16:06:33 +0200 Subject: [PATCH 2/8] bump to go 1.24.5 --- builder2/Dockerfile | 4 ++-- go.mod | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builder2/Dockerfile b/builder2/Dockerfile index e662b89..e76bc82 100644 --- a/builder2/Dockerfile +++ b/builder2/Dockerfile @@ -12,8 +12,8 @@ ENV GOCACHE /go/.cache ENV PATH "$PATH:$GOPATH/bin" # hack, but currently don't bother how to properly setup go in current version -RUN mkdir /go -RUN chmod a+rwx /go +RUN sudo mkdir /go +RUN sudo chmod a+rwx /go RUN go install github.com/tcnksm/ghr@v0.17.0 RUN go install github.com/stevenmatthewt/semantics@v2.0.4 diff --git a/go.mod b/go.mod index 144122b..595e32c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/MeneDev/yubi-oath-vpn -go 1.19 +go 1.24 require ( github.com/ebfe/scard v0.0.0-20190212122703-c3d1b1916a95 From 7545e45213eb5bac610b68c7d242efdbfc6fa350 Mon Sep 17 00:00:00 2001 From: Michael Arndt Date: Tue, 15 Jul 2025 16:22:07 +0200 Subject: [PATCH 3/8] bump to go 1.24.5 --- builder2/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/builder2/Dockerfile b/builder2/Dockerfile index e76bc82..308276d 100644 --- a/builder2/Dockerfile +++ b/builder2/Dockerfile @@ -5,6 +5,7 @@ RUN sudo apt-get update && sudo apt-get install -y \ libpcsclite-dev \ libudev-dev \ libusb-1.0-0-dev \ + mingw-w64 \ && sudo rm -rf /var/lib/apt/lists/* ENV GOPATH /go From 6b543ddb97a80d9e226f8a6fc2ff52e40d024f2f Mon Sep 17 00:00:00 2001 From: Michael Arndt Date: Tue, 15 Jul 2025 16:50:19 +0200 Subject: [PATCH 4/8] bump to go 1.24.5 --- builder2/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/builder2/Dockerfile b/builder2/Dockerfile index 308276d..750fe92 100644 --- a/builder2/Dockerfile +++ b/builder2/Dockerfile @@ -1,6 +1,7 @@ FROM cimg/go:1.24.5 RUN sudo apt-get update && sudo apt-get install -y \ + libc6-dev \ libgtk-3-dev \ libpcsclite-dev \ libudev-dev \ @@ -8,9 +9,9 @@ RUN sudo apt-get update && sudo apt-get install -y \ mingw-w64 \ && sudo rm -rf /var/lib/apt/lists/* -ENV GOPATH /go -ENV GOCACHE /go/.cache -ENV PATH "$PATH:$GOPATH/bin" +ENV GOPATH=/go +ENV GOCACHE=/go/.cache +ENV PATH="$PATH:$GOPATH/bin" # hack, but currently don't bother how to properly setup go in current version RUN sudo mkdir /go From 41e9a6c61d0ff0139cf758ebb716606dacb0f7e7 Mon Sep 17 00:00:00 2001 From: Michael Arndt Date: Tue, 15 Jul 2025 17:14:24 +0200 Subject: [PATCH 5/8] bump to go 1.24.5 --- builder2/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder2/Dockerfile b/builder2/Dockerfile index 750fe92..c8cd77a 100644 --- a/builder2/Dockerfile +++ b/builder2/Dockerfile @@ -1,12 +1,12 @@ FROM cimg/go:1.24.5 RUN sudo apt-get update && sudo apt-get install -y \ - libc6-dev \ libgtk-3-dev \ libpcsclite-dev \ libudev-dev \ libusb-1.0-0-dev \ mingw-w64 \ + mingw-w64-tools \ && sudo rm -rf /var/lib/apt/lists/* ENV GOPATH=/go From 48e4453104378d9d29a0b808b7ea4a25a458b964 Mon Sep 17 00:00:00 2001 From: Michael Arndt Date: Tue, 15 Jul 2025 17:23:02 +0200 Subject: [PATCH 6/8] bump to go 1.24.5 --- builder2/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/builder2/Dockerfile b/builder2/Dockerfile index c8cd77a..140fa0b 100644 --- a/builder2/Dockerfile +++ b/builder2/Dockerfile @@ -6,7 +6,11 @@ RUN sudo apt-get update && sudo apt-get install -y \ libudev-dev \ libusb-1.0-0-dev \ mingw-w64 \ + mingw-w64-common \ mingw-w64-tools \ + mingw-w64-dev \ + gcc-mingw-w64-x86-64 \ + gettext \ && sudo rm -rf /var/lib/apt/lists/* ENV GOPATH=/go From ca7fb7527f8faee69b3d2a97b60a60c259f6679f Mon Sep 17 00:00:00 2001 From: Michael Arndt Date: Tue, 15 Jul 2025 17:57:43 +0200 Subject: [PATCH 7/8] bump go to 1.24 --- builder2/Dockerfile | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/builder2/Dockerfile b/builder2/Dockerfile index 140fa0b..684db9e 100644 --- a/builder2/Dockerfile +++ b/builder2/Dockerfile @@ -1,25 +1,34 @@ -FROM cimg/go:1.24.5 +FROM fedora:42 -RUN sudo apt-get update && sudo apt-get install -y \ - libgtk-3-dev \ - libpcsclite-dev \ - libudev-dev \ - libusb-1.0-0-dev \ - mingw-w64 \ - mingw-w64-common \ - mingw-w64-tools \ - mingw-w64-dev \ - gcc-mingw-w64-x86-64 \ - gettext \ -&& sudo rm -rf /var/lib/apt/lists/* +RUN dnf install -y \ + findutils \ + git \ + golang \ + gtk3-devel \ + libudev-devel \ + libusbx-devel \ + mingw32-gcc \ + mingw64-gcc \ + mingw32-gcc-c++ \ + mingw32-glib2 \ + mingw32-gtk3 \ + mingw32-libusbx \ + mingw64-gcc-c++ \ + mingw64-glib2 \ + mingw64-gtk3 \ + mingw64-libusbx \ + pcsc-lite-devel \ + zip \ + && \ + dnf clean all ENV GOPATH=/go ENV GOCACHE=/go/.cache ENV PATH="$PATH:$GOPATH/bin" # hack, but currently don't bother how to properly setup go in current version -RUN sudo mkdir /go -RUN sudo chmod a+rwx /go +RUN mkdir /go +RUN chmod a+rwx /go RUN go install github.com/tcnksm/ghr@v0.17.0 RUN go install github.com/stevenmatthewt/semantics@v2.0.4 From 95c22b59ebe1bd2da2e7046331840e7332749633 Mon Sep 17 00:00:00 2001 From: Michael Arndt Date: Tue, 15 Jul 2025 18:05:10 +0200 Subject: [PATCH 8/8] bump go to 1.24 --- builder2/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder2/Dockerfile b/builder2/Dockerfile index 684db9e..f15692e 100644 --- a/builder2/Dockerfile +++ b/builder2/Dockerfile @@ -3,7 +3,7 @@ FROM fedora:42 RUN dnf install -y \ findutils \ git \ - golang \ + golang-1.24.5 \ gtk3-devel \ libudev-devel \ libusbx-devel \