From d3fdb4c58330420b721f04c2215776fca806036d Mon Sep 17 00:00:00 2001 From: Alexander Vollschwitz Date: Tue, 4 Apr 2023 11:05:56 +0200 Subject: [PATCH] upgrades: Go 1.20.2, latest Ubuntu 22.04 & Alpine 3.17, Skope 1.11.2 --- Makefile | 12 ++++++------ hack/dregsy.alpine.Dockerfile | 4 ++-- hack/dregsy.ubuntu.Dockerfile | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 5dcbd04..0f5326f 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ SHELL = /bin/bash REPO = dregsy DREGSY_VERSION = $$(git describe --always --tag --dirty) -SKOPEO_VERSION = v1.11.1 # https://github.com/containers/skopeo/releases +SKOPEO_VERSION = v1.11.2 # https://github.com/containers/skopeo/releases ROOT = $(shell pwd) BUILD_OUTPUT =_build @@ -27,12 +27,12 @@ BINARIES = $(BUILD_OUTPUT)/bin ISOLATED_PKG = $(BUILD_OUTPUT)/pkg ISOLATED_CACHE = $(BUILD_OUTPUT)/cache -GO_IMAGE = docker.io/golang:1.20.1 +GO_IMAGE = docker.io/golang:1.20.2 # use digests of plain golang:{x:y:z} image -GO_IMAGE_DIGEST_amd64 = 745aa72cefb6f9527c1588590982c0bdf85a1be5d611dda849e54b5dbf551506 # linux/amd64 -GO_IMAGE_DIGEST_arm64 = 661f0764dd908d17da7768357e112d879d978795fb8775cbea218b51f1eacdce # linux/arm64/v8 -GO_IMAGE_DIGEST_arm = a60c7c77645771a2c18b522b17f02501a163db63c6c757b623e3e7f5bb4d9d4b # linux/arm/v7 -GO_IMAGE_DIGEST_386 = a840a362ec2b95369e12ededa9a3477d454a30fbf75dfa40a1114441f6c60800 # linux/386 +GO_IMAGE_DIGEST_amd64 = 2101aa981e68ab1e06e3d4ac35ae75ed122f0380e5331e3ae4ba7e811bf9d256 # linux/amd64 +GO_IMAGE_DIGEST_arm64 = 2b66aad188b275018254d2877159381a05013fc8c5f695e9595a56fcfc83d995 # linux/arm64/v8 +GO_IMAGE_DIGEST_arm = 1cac9131c1684a9c407b618da17948780bfd061a91377f20df21b92066d6f9a1 # linux/arm/v7 +GO_IMAGE_DIGEST_386 = 5c3c6546290acfd0c5de02eae32fac9711d2831c3ad6f74fefa872981bf9cff7 # linux/386 GOOS = $(shell uname -s | tr A-Z a-z) GOARCH = $(shell ./hack/devenvutil get_architecture) diff --git a/hack/dregsy.alpine.Dockerfile b/hack/dregsy.alpine.Dockerfile index 514db66..4e69689 100644 --- a/hack/dregsy.alpine.Dockerfile +++ b/hack/dregsy.alpine.Dockerfile @@ -16,7 +16,7 @@ # Skopeo build, taken from https://github.com/bdwyertech/docker-skopeo # -FROM docker.io/golang:1.20.1-alpine3.17@sha256:18da4399cedd9e383beb6b104d43aa1d48bd41167e312bb5306d72c51bd11548 as skopeo +FROM docker.io/golang:1.20.2-alpine3.17@sha256:bba3c7269b3d4aa875230617947481439b92cab8853b59ff8709fb047587c2eb as skopeo ARG SKOPEO_VERSION @@ -32,7 +32,7 @@ RUN apk add --no-cache --virtual .build-deps \ # dregsy image # -FROM docker.io/alpine:3.17.2@sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501 +FROM docker.io/alpine:3.17.3@sha256:b6ca290b6b4cdcca5b3db3ffa338ee0285c11744b4a6abaa9627746ee3291d8d LABEL maintainer "vollschwitz@gmx.net" diff --git a/hack/dregsy.ubuntu.Dockerfile b/hack/dregsy.ubuntu.Dockerfile index 322295d..7e92716 100644 --- a/hack/dregsy.ubuntu.Dockerfile +++ b/hack/dregsy.ubuntu.Dockerfile @@ -16,7 +16,7 @@ # Skopeo build # -FROM docker.io/golang:1.20.1@sha256:745aa72cefb6f9527c1588590982c0bdf85a1be5d611dda849e54b5dbf551506 as skopeo +FROM docker.io/golang:1.20.2@sha256:2101aa981e68ab1e06e3d4ac35ae75ed122f0380e5331e3ae4ba7e811bf9d256 as skopeo ARG SKOPEO_VERSION @@ -32,7 +32,7 @@ RUN apt-get update \ # dregsy image # -FROM docker.io/ubuntu:22.04@sha256:c985bc3f77946b8e92c9a3648c6f31751a7dd972e06604785e47303f4ad47c4c +FROM docker.io/ubuntu:22.04@sha256:7a57c69fe1e9d5b97c5fe649849e79f2cfc3bf11d10bbd5218b4eb61716aebe6 LABEL maintainer "vollschwitz@gmx.net"