From 1c2c1b311b45f25d6de963a4f33910d57cce4a15 Mon Sep 17 00:00:00 2001
From: Seraphim Strub <sst@rievo.net>
Date: Mon, 12 Feb 2024 17:03:15 +0000
Subject: [PATCH] switch to chainguard images

---
 .gitlab-ci.yml              | 5 +++--
 Dockerfile => Containerfile | 9 ++++-----
 go.sum                      | 6 ------
 3 files changed, 7 insertions(+), 13 deletions(-)
 rename Dockerfile => Containerfile (57%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2221893..41f4d46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@
         tag=":$CI_COMMIT_REF_SLUG"
         echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
       fi
-    - docker build --pull --build-arg GO_CMD=${GO_CMD} -t "$CI_REGISTRY_IMAGE/${GO_CMD}${tag}" .
+    - docker build --pull --build-arg GO_CMD=${GO_CMD} -t "$CI_REGISTRY_IMAGE/${GO_CMD}${tag}" . -f Containerfile
     - docker push "$CI_REGISTRY_IMAGE/${GO_CMD}${tag}"
   # Run this job in a branch where a Dockerfile exists
   rules:
@@ -24,6 +24,7 @@
         - cmd/${GO_CMD}/*/**
         - cmd/${GO_CMD}/*
         - go.mod
+        - Containerfile
 
 funbot:
   stage: build
@@ -78,4 +79,4 @@ pages:
   rules:
     - if: $CI_COMMIT_BRANCH
       changes:
-        - cmd/domaincheckbot/config/domain.json
\ No newline at end of file
+        - cmd/domaincheckbot/config/domain.json
diff --git a/Dockerfile b/Containerfile
similarity index 57%
rename from Dockerfile
rename to Containerfile
index 253dd43..c9b338b 100644
--- a/Dockerfile
+++ b/Containerfile
@@ -1,4 +1,4 @@
-FROM golang:latest as builder
+FROM cgr.dev/chainguard/go:latest as build
 
 ARG GO_CMD=funbot
 ENV CGO_ENABLED=0 \
@@ -11,10 +11,9 @@ ADD . /app/
 
 RUN go build -ldflags "-X main.release=$(git rev-parse --short HEAD) -s -w -extldflags '-static'" -o /main ./cmd/${GO_CMD}/
 
-FROM scratch
-COPY --chown=65534:0 --from=builder /main /
-COPY --chown=65534:0 --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+FROM cgr.dev/chainguard/static:latest
+COPY --chown=65534:0 --from=build /main /
 USER 65534
 WORKDIR /
 
-CMD ["/main"]
\ No newline at end of file
+CMD ["/main"]
diff --git a/go.sum b/go.sum
index 73f99e5..67dc800 100644
--- a/go.sum
+++ b/go.sum
@@ -94,8 +94,6 @@ go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
-golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
 golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -113,8 +111,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
-golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
 golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -128,8 +124,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=