Skip to content

Commit

Permalink
feat: update dependencies for Talos 1.6.0
Browse files Browse the repository at this point in the history
Update dependencies (mostly grub).

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
  • Loading branch information
smira committed Dec 12, 2023
1 parent 01fcbf1 commit 7f595a7
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2023-11-30T12:42:01Z by kres latest.
# Generated on 2023-12-11T14:43:26Z by kres latest.

name: default
concurrency:
Expand Down Expand Up @@ -31,7 +31,7 @@ jobs:
if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/'))
services:
buildkitd:
image: moby/buildkit:v0.12.3
image: moby/buildkit:v0.12.4
options: --privileged
ports:
- 1234:1234
Expand Down
8 changes: 4 additions & 4 deletions .kres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ spec:
xorriso
xz
copyFrom:
- stage: ghcr.io/siderolabs/grub:v1.5.0
- stage: ghcr.io/siderolabs/grub:v1.6.0-3-g617d342
source: /
destination: /
- stage: ghcr.io/siderolabs/grub@sha256:b3200d08c4c9295e02dfb11e5760c5dbe2ffe1b1191272851ab03e527220094c # amd64
- stage: ghcr.io/siderolabs/grub@sha256:9c17d29995e569a30ef7e35bfc5aedf9fee4de7f285787322c90dc807af08302 # amd64
source: /usr/lib/grub
destination: /usr/lib/grub
- stage: ghcr.io/siderolabs/grub@sha256:a8936963fc5f1fb83b057eb2369371ec7a4e7a9cfda71a804c5d6f8de222abea # arm64
- stage: ghcr.io/siderolabs/grub@sha256:29014cfe94f68d815e94b990a381bdc464b78fc989e775c748894ce359bcf3a5 # arm64
source: /usr/lib/grub
destination: /usr/lib/grub
- stage: ghcr.io/siderolabs/installer:v1.5.0
- stage: ghcr.io/siderolabs/installer:v1.6.0-beta.1
source: /usr/share/grub/unicode.pf2
destination: /usr/share/grub/unicode.pf2
---
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2023-11-30T12:42:01Z by kres latest.
# Generated on 2023-12-12T13:59:28Z by kres latest.

ARG TOOLCHAIN

FROM alpine:3.18 AS base-image-image-factory

# runs markdownlint
FROM docker.io/node:21.1.0-alpine3.18 AS lint-markdown
FROM docker.io/node:21.4.0-alpine3.18 AS lint-markdown
WORKDIR /src
RUN npm i -g markdownlint-cli@0.37.0
RUN npm i sentences-per-line@0.2.1
Expand Down Expand Up @@ -156,10 +156,10 @@ FROM base-image-image-factory AS image-image-factory
RUN apk add --no-cache --update bash binutils-aarch64 binutils-x86_64 cpio dosfstools efibootmgr kmod mtools pigz qemu-img squashfs-tools tar util-linux xfsprogs xorriso xz
ARG TARGETARCH
COPY --from=image-factory image-factory-linux-${TARGETARCH} /image-factory
COPY --from=ghcr.io/siderolabs/grub:v1.5.0 / /
COPY --from=ghcr.io/siderolabs/grub@sha256:b3200d08c4c9295e02dfb11e5760c5dbe2ffe1b1191272851ab03e527220094c /usr/lib/grub /usr/lib/grub
COPY --from=ghcr.io/siderolabs/grub@sha256:a8936963fc5f1fb83b057eb2369371ec7a4e7a9cfda71a804c5d6f8de222abea /usr/lib/grub /usr/lib/grub
COPY --from=ghcr.io/siderolabs/installer:v1.5.0 /usr/share/grub/unicode.pf2 /usr/share/grub/unicode.pf2
COPY --from=ghcr.io/siderolabs/grub:v1.6.0-3-g617d342 / /
COPY --from=ghcr.io/siderolabs/grub@sha256:9c17d29995e569a30ef7e35bfc5aedf9fee4de7f285787322c90dc807af08302 /usr/lib/grub /usr/lib/grub
COPY --from=ghcr.io/siderolabs/grub@sha256:29014cfe94f68d815e94b990a381bdc464b78fc989e775c748894ce359bcf3a5 /usr/lib/grub /usr/lib/grub
COPY --from=ghcr.io/siderolabs/installer:v1.6.0-beta.1 /usr/share/grub/unicode.pf2 /usr/share/grub/unicode.pf2
LABEL org.opencontainers.image.source https://github.com/siderolabs/image-factory
ENTRYPOINT ["/image-factory"]

6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2023-11-30T12:36:19Z by kres latest.
# Generated on 2023-12-12T13:59:28Z by kres latest.

# common variables

Expand All @@ -21,8 +21,8 @@ VTPROTOBUF_VERSION ?= 0.5.0
DEEPCOPY_VERSION ?= v0.5.5
GOLANGCILINT_VERSION ?= v1.55.2
GOFUMPT_VERSION ?= v0.5.0
GO_VERSION ?= 1.21.4
GOIMPORTS_VERSION ?= v0.15.0
GO_VERSION ?= 1.21.5
GOIMPORTS_VERSION ?= v0.16.0
GO_BUILDFLAGS ?=
GO_LDFLAGS ?=
CGO_ENABLED ?= 0
Expand Down

0 comments on commit 7f595a7

Please sign in to comment.