From 6c0997ba943683dd4015aa28c8df9313d90377d9 Mon Sep 17 00:00:00 2001 From: dubo-dubon-duponey Date: Sun, 17 Mar 2024 10:01:14 -0700 Subject: [PATCH] Bump --- .gitignore | 6 ++---- DEVELOP.md | 6 +++--- Dockerfile | 10 +++++----- hack/helpers/install-tools.sh | 2 +- hack/recipe.cue | 2 +- hack/test.sh | 2 +- 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 507266e..22894af 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ .DS_Store /.idea -*/cache/* -cache -*trace.json -xxx-* +cache/ +/xxx-* diff --git a/DEVELOP.md b/DEVELOP.md index 46931a8..d312032 100644 --- a/DEVELOP.md +++ b/DEVELOP.md @@ -10,11 +10,11 @@ ### The what -This image is built using: `docker.io/dubodubonduponey/base:builder-bookworm-2024-02-20` +This image is built using: `docker.io/dubodubonduponey/base:builder-bookworm-2024-03-01` -The runtime part is based on: `docker.io/dubodubonduponey/base:runtime-bookworm-2024-02-20` +The runtime part is based on: `docker.io/dubodubonduponey/base:runtime-bookworm-2024-03-01` -Both these images are built upon: `docker.io/dubodubonduponey/debian:bookworm-2024-02-20` +Both these images are built upon: `docker.io/dubodubonduponey/debian:bookworm-2024-03-01` You can find out more here: diff --git a/Dockerfile b/Dockerfile index cc05a60..f752fa2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ ARG FROM_REGISTRY=docker.io/dubodubonduponey -ARG FROM_IMAGE_FETCHER=base:golang-bookworm-2024-02-20 -ARG FROM_IMAGE_BUILDER=base:builder-bookworm-2024-02-20 -ARG FROM_IMAGE_AUDITOR=base:auditor-bookworm-2024-02-20 -ARG FROM_IMAGE_TOOLS=tools:linux-bookworm-2024-02-20 -ARG FROM_IMAGE_RUNTIME=base:runtime-bookworm-2024-02-20 +ARG FROM_IMAGE_FETCHER=base:golang-bookworm-2024-03-01 +ARG FROM_IMAGE_BUILDER=base:builder-bookworm-2024-03-01 +ARG FROM_IMAGE_AUDITOR=base:auditor-bookworm-2024-03-01 +ARG FROM_IMAGE_TOOLS=tools:linux-bookworm-2024-03-01 +ARG FROM_IMAGE_RUNTIME=base:runtime-bookworm-2024-03-01 FROM $FROM_REGISTRY/$FROM_IMAGE_TOOLS AS builder-tools diff --git a/hack/helpers/install-tools.sh b/hack/helpers/install-tools.sh index 0166b3a..708f8ab 100755 --- a/hack/helpers/install-tools.sh +++ b/hack/helpers/install-tools.sh @@ -2,7 +2,7 @@ set -o errexit -o errtrace -o functrace -o nounset -o pipefail export SUITE=bookworm -export DATE=2024-02-20 +export DATE=2024-03-01 export BIN_LOCATION="${BIN_LOCATION:-$HOME/bin}" export PATH="$BIN_LOCATION:$PATH" diff --git a/hack/recipe.cue b/hack/recipe.cue index 0b81d40..23e56e9 100644 --- a/hack/recipe.cue +++ b/hack/recipe.cue @@ -42,7 +42,7 @@ cakes: { injectors: { suite: * "bookworm" | =~ "^(?:bullseye|bookworm|trixie|sid)$" @tag(suite, type=string) - date: * "2024-02-20" | =~ "^[0-9]{4}-[0-9]{2}-[0-9]{2}$" @tag(date, type=string) + date: * "2024-03-01" | =~ "^[0-9]{4}-[0-9]{2}-[0-9]{2}$" @tag(date, type=string) platforms: string @tag(platforms, type=string) registry: * "registry.local" | string @tag(registry, type=string) } diff --git a/hack/test.sh b/hack/test.sh index 14be565..7d2b3f6 100755 --- a/hack/test.sh +++ b/hack/test.sh @@ -10,7 +10,7 @@ readonly root if ! "$root/hack/build.sh" \ --inject registry="docker.io/dubodubonduponey" \ --inject progress=plain \ - --inject date=2024-02-20 \ + --inject date=2024-03-01 \ --inject suite=bookworm \ --inject platforms=linux/arm64 \ "image" "$@"; then