Skip to content

Commit 176b930

Browse files
authored
Switch melange and apko files to use cve0 APK repo (#5826)
1 parent d9ec012 commit 176b930

6 files changed

Lines changed: 54 additions & 37 deletions

File tree

.github/workflows/image-deps-updater.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,8 @@ jobs:
2121
run: |
2222
set -euo pipefail
2323
24-
# We're only using the APKINDEX files to get the versions, so it doesn't matter which arch we use
25-
26-
curl -LO --fail --show-error https://packages.wolfi.dev/os/x86_64/APKINDEX.tar.gz
27-
tar -xzvf APKINDEX.tar.gz
28-
29-
minio_version=$(< APKINDEX grep -A1 "^P:minio$" | tail -n 1 | sed -n -e 's/V://p' | tr -d '\n')
30-
31-
sed "s/__MINIO_VERSION__/$minio_version/g" deploy/minio/apko.yaml.tmpl > deploy/minio/apko.yaml
24+
# minio repo is now read-only and the version will never change
25+
minio_version="0.20251015.172955"
3226
3327
# Get latest rqlite version from registry
3428
rqlite_version=$(skopeo list-tags docker://proxy.replicated.com/library/rqlite | \

deploy/apko.yaml.tmpl

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
contents:
22
repositories:
3-
- https://packages.wolfi.dev/os
3+
- https://apk.cve0.io
44
- ./packages/
55
keyring:
6-
- https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
6+
- https://apk.cve0.io/key/cve0-signing.rsa.pub
77
- ./melange-arm64.rsa.pub
88
- ./melange-amd64.rsa.pub
99
packages:
@@ -14,10 +14,11 @@ contents:
1414
- curl
1515
- git
1616
- kustomize
17-
- py3-dateutil
18-
- py3-magic
19-
- s3cmd
20-
- wolfi-baselayout
17+
- py3.14-magic
18+
- py3-six-1.16-six3.14
19+
- s3cmd-2.4-py3.14
20+
- securebuild-baselayout
21+
- helm~4
2122

2223
accounts:
2324
groups:
@@ -32,6 +33,16 @@ accounts:
3233
environment:
3334
VERSION: ${GIT_TAG}
3435

36+
paths:
37+
- path: /usr/local/bin/helm
38+
type: symlink
39+
source: /usr/bin/helm
40+
permissions: 0o755
41+
- path: /usr/local/bin/kustomize
42+
type: symlink
43+
source: /usr/bin/kustomize
44+
permissions: 0o755
45+
3546
entrypoint:
3647
command: /kotsadm
3748

deploy/melange.yaml.tmpl

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@ package:
99
environment:
1010
contents:
1111
repositories:
12-
- https://packages.wolfi.dev/os
12+
- https://apk.cve0.io
1313
keyring:
14-
- https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
14+
- https://apk.cve0.io/key/cve0-signing.rsa.pub
1515
packages:
1616
- ca-certificates-bundle
17+
- bash
1718
- busybox
1819
- curl
1920
- git
2021
- go
21-
- nodejs-24
22+
- nodejs~24
2223
- yarn
2324

2425
pipeline:
@@ -35,7 +36,7 @@ pipeline:
3536
export GIT_TAG=${GIT_TAG}
3637

3738
# Set environment variables from repository
38-
source .image.env
39+
. ./.image.env
3940

4041
# TODO: fix pact build error on arm https://github.com/pact-foundation/pact-js-core/issues/264
4142
export PACT_SKIP_BINARY_INSTALL=true
@@ -49,10 +50,3 @@ pipeline:
4950

5051
mv bin/kotsadm "${DESTDIR}/kotsadm"
5152
mv bin/kots "${DESTDIR}/kots"
52-
53-
make helm
54-
mkdir -p "${DESTDIR}/usr/bin"
55-
mv bin/helm "${DESTDIR}/usr/bin/helm"
56-
57-
ln -s /usr/bin/helm ${DESTDIR}/usr/local/bin/helm
58-
ln -s /usr/bin/kustomize ${DESTDIR}/usr/local/bin/kustomize

deploy/minio/apko.yaml.tmpl

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
11
contents:
22
repositories:
3-
- https://packages.wolfi.dev/os
3+
- https://apk.cve0.io
44
keyring:
5-
- https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
5+
- https://apk.cve0.io/key/cve0-signing.rsa.pub
66
packages:
7-
- minio=__MINIO_VERSION__
8-
- mc
9-
- bash
7+
- minio~0.20251015.172955
8+
- minio-oci-entrypoint~0.20251015.172955
9+
- ca-certificates-bundle
10+
- securebuild-baselayout
1011
- busybox
12+
- coreutils
13+
- glibc
14+
15+
entrypoint:
16+
command: /usr/bin/docker-entrypoint.sh
17+
18+
cmd: minio
19+
20+
stop-signal: SIGTERM
1121

1222
accounts:
1323
groups:
@@ -19,5 +29,12 @@ accounts:
1929
gid: 1001
2030
run-as: minio
2131

22-
entrypoint:
23-
command: minio
32+
volumes:
33+
- /data
34+
35+
paths:
36+
- path: /data
37+
type: directory
38+
permissions: 0o755
39+
40+
work-dir: /

kurl_proxy/deploy/apko.yaml.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
contents:
22
repositories:
3-
- https://packages.wolfi.dev/os
3+
- https://apk.cve0.io
44
- ./packages/
55
keyring:
6-
- https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
6+
- https://apk.cve0.io/key/cve0-signing.rsa.pub
77
- ./melange-arm64.rsa.pub
88
- ./melange-amd64.rsa.pub
99
packages:
@@ -12,7 +12,7 @@ contents:
1212
- busybox
1313
- curl
1414
- git
15-
- wolfi-baselayout
15+
- securebuild-baselayout
1616

1717
accounts:
1818
groups:

kurl_proxy/deploy/melange.yaml.tmpl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ package:
99
environment:
1010
contents:
1111
repositories:
12-
- https://packages.wolfi.dev/os
12+
- https://apk.cve0.io
1313
keyring:
14-
- https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
14+
- https://apk.cve0.io/key/cve0-signing.rsa.pub
1515
packages:
1616
- ca-certificates-bundle
1717
- busybox
1818
- git
19+
- bash
1920
- go
2021

2122
pipeline:

0 commit comments

Comments
 (0)