Move the fips toolchain-go-ubuntu back to ubuntu (#761)

This commit is contained in:
Itxaka 2024-03-21 14:36:11 +01:00 committed by GitHub
parent 1597f5208f
commit 776dbb1fc0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 13 deletions

View File

@ -2,7 +2,7 @@
requires: requires:
- name: "toolchain-go-ubuntu" - name: "toolchain-go-ubuntu"
category: "fips" category: "fips"
version: ">=0" version: ">=1.19.10+1"
{{else}} {{else}}
requires: requires:
- name: "toolchain-go-ubuntu" - name: "toolchain-go-ubuntu"
@ -36,8 +36,8 @@ steps:
{{end}} {{end}}
- mkdir -p /usr/lib/dracut/modules.d - mkdir -p /usr/lib/dracut/modules.d
- mkdir -p /etc/dracut.conf.d/ - mkdir -p /etc/dracut.conf.d/
- cp -r {{.Values.name}}/dracut/28immucore /usr/lib/dracut/modules.d/28immucore - cp -r go/src/github.com/${GITHUB_ORG}/{{.Values.name}}/dracut/28immucore /usr/lib/dracut/modules.d/28immucore
- cp {{.Values.name}}/dracut/10-immucore.conf /etc/dracut.conf.d/10-immucore.conf - cp go/src/github.com/${GITHUB_ORG}/{{.Values.name}}/dracut/10-immucore.conf /etc/dracut.conf.d/10-immucore.conf
includes: includes:
- /usr/bin/{{.Values.name}} - /usr/bin/{{.Values.name}}
- /usr/lib/dracut/modules.d/28immucore - /usr/lib/dracut/modules.d/28immucore

View File

@ -1,7 +1,7 @@
packages: packages:
- name: "immucore" - name: "immucore"
category: "system" category: "system"
version: "0.1.21+1" version: "0.1.21+2"
labels: labels:
github.repo: "immucore" github.repo: "immucore"
autobump.revdeps: "true" autobump.revdeps: "true"
@ -12,7 +12,7 @@ packages:
description: "The Kairos immutability management interface" description: "The Kairos immutability management interface"
- name: "immucore" - name: "immucore"
category: "fips" category: "fips"
version: "0.1.21+1" version: "0.1.21+2"
labels: labels:
github.repo: "immucore" github.repo: "immucore"
autobump.revdeps: "true" autobump.revdeps: "true"

View File

@ -16,4 +16,7 @@ prelude:
- mv upx-4.2.2-{{ .Values.arch }}_linux/upx /usr/bin/ - mv upx-4.2.2-{{ .Values.arch }}_linux/upx /usr/bin/
- rm -rf upx-4.2.2-{{ .Values.arch }}_linux - rm -rf upx-4.2.2-{{ .Values.arch }}_linux
- chmod +x /usr/bin/upx - chmod +x /usr/bin/upx
{{ end }}
{{ if eq .Values.variant "bullseye" }}
- apt-get update && apt-get install -y curl xz-utils upx
{{ end }} {{ end }}

View File

@ -67,12 +67,6 @@ packages:
version: "1.19.10" version: "1.19.10"
tag: "1.19.10" tag: "1.19.10"
hidden: true hidden: true
- name: toolchain-go-ubuntu
variant: "bookworm"
category: fips
version: "1.19.10"
tag: "1.19.10"
hidden: true
- name: toolchain-go - name: toolchain-go
category: fips category: fips
variant: "alpine" variant: "alpine"
@ -80,8 +74,8 @@ packages:
tag: "1.19.10" tag: "1.19.10"
hidden: true hidden: true
- name: toolchain-go-ubuntu - name: toolchain-go-ubuntu
variant: "bookworm" variant: "bullseye"
category: fips category: fips
version: "1.19.10" version: "1.19.10+1"
tag: "1.19.10" tag: "1.19.10"
hidden: true hidden: true