Merge pull request #114 from crazy-max/update-alpine

dockerfile: update go to 1.23 and alpine to 3.21

.github/workflows/e2e.yml

@@ -58,7 +58,7 @@ jobs:
       -
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: "1.23"
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

Dockerfile

@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG GO_VERSION="1.21"
-ARG ALPINE_VERSION="3.19"
-ARG XX_VERSION="1.4.0"
+ARG GO_VERSION="1.23"
+ARG ALPINE_VERSION="3.21"
+ARG XX_VERSION="1.6.1"
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
 
@@ -40,7 +40,7 @@ RUN --mount=target=. <<EOT
   echo "-extldflags -static -X ${pkg}/version.Version=${version} -X ${pkg}/version.SyftVersion=$(go list -mod=mod -u -m -f '{{.Version}}' 'github.com/anchore/syft')" | tee /tmp/.ldflags
 EOT
 
-FROM base as build
+FROM base AS build
 ARG TARGETPLATFORM
 RUN --mount=type=bind,target=. \
     --mount=type=bind,from=version,source=/tmp/.ldflags,target=/tmp/.ldflags \

docker-bake.hcl

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 variable "GO_VERSION" {
-  default = "1.21"
+  default = null
 }
 
 # GITHUB_REF is the actual ref that triggers the workflow and used as version

examples/centos/Dockerfile

@@ -16,6 +16,12 @@
 
 FROM centos:7 AS base
 ARG BUILDKIT_SBOM_SCAN_STAGE=true
+
+# fix name of Centos repos as mirror.centos.org no longer exists
+RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo
+RUN sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo
+RUN sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo
+
 RUN yum install -y findutils
 COPY <<EOF /empty
 EOF

go.mod

@@ -1,6 +1,6 @@
 module github.com/docker/buildkit-syft-scanner
 
-go 1.21.0
+go 1.23.0
 
 require (
 	github.com/anchore/go-logger v0.0.0-20230725134548-c21dafa1ec5a

hack/dockerfiles/vendor.Dockerfile

@@ -16,8 +16,8 @@
 
 # upstream at https://github.com/moby/buildkit/blob/master/hack/dockerfiles/vendor.Dockerfile
 
-ARG GO_VERSION="1.21"
-ARG ALPINE_VERSION="3.17"
+ARG GO_VERSION="1.23"
+ARG ALPINE_VERSION="3.21"
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base
 RUN apk add --no-cache git rsync