fixed certs issue with goreleaser, pickup newer fortio with version i…

…ncluding ours
fortio · Jan 2, 2023 · 7abc8b7 · 7abc8b7
1 parent da6bc80
commit 7abc8b7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/releaser.yml b/.github/workflows/releaser.yml
@@ -18,12 +18,14 @@ jobs:
         uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # pin@v3
         with:
           fetch-depth: 0
+      - uses: docker/setup-qemu-action@27d0a4f181a40b142cce983c5393082c365d1480 # pin@v1
+      - uses: docker/setup-buildx-action@f211e3e9ded2d9377c8cadc4489a4e38014bc4c9 # pin@v1
       - name: Set up Go
         uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # pin@v3
         with:
           go-version: '1.19.4'
       - name: Log in to Docker Hub
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # pin@f054a8b539a109f9f41c372932f1ae047eff08c9
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # pin@v2
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_TOKEN }}

diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,9 @@
 # Go releaser dockerfile
-#FROM alpine as certs
-#RUN apk update && apk add ca-certificates
-# ^ alpine doesn't seem to work (with goreleaser, works fine from docker build cmd line), trying with ubuntu
-#FROM ubuntu as certs
-#RUN apt-get update && apt-get install -y ca-certificates
-# ^ doesn't (yet) work either https://github.com/goreleaser/goreleaser/issues/3676
+FROM alpine as certs
+RUN apk update && apk add ca-certificates
 FROM scratch
 COPY fortiotel /usr/bin/fortio
-#COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 ENTRYPOINT ["/usr/bin/fortio"]
 EXPOSE 8080
 # Prom metrics exports/scrape

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module fortio.org/fortiotel
 go 1.18
 
 require (
-	fortio.org/fortio v1.39.0-pre9
+	fortio.org/fortio v1.39.0-pre11
 	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.37.0
 	go.opentelemetry.io/otel v1.11.2
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.2

diff --git a/go.sum b/go.sum
@@ -32,8 +32,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 fortio.org/assert v1.1.2 h1:t6WGDqPD5VFrUvx30U0+3mgXXcoPonrdKqt0vfJHn8E=
-fortio.org/fortio v1.39.0-pre9 h1:REcy8PzDvXSbkCmodvwNc2qWxGRuwvkl2S9Zo/GneCQ=
-fortio.org/fortio v1.39.0-pre9/go.mod h1:4DhI17BkI3sU0DR4Z2HwochdpphTae+8NgZwWy6epRk=
+fortio.org/fortio v1.39.0-pre11 h1:VcvvKJvCX67rsrfDmEXnC4lpmBTA6X0cEujvPF4Meww=
+fortio.org/fortio v1.39.0-pre11/go.mod h1:4DhI17BkI3sU0DR4Z2HwochdpphTae+8NgZwWy6epRk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=