From a0d711ac0104ad57c1ebbabb70a54c825d33e745 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Mon, 3 Oct 2022 18:41:29 +0200 Subject: [PATCH] feat: various version bumps, build fixes --- .gitignore | 1 - Makefile | 33 ++++++++----------- v3.15/.gitignore | 18 ++++++++++ v3.16/.gitignore | 18 ++++++++++ v3.16/fluent-bit/APKBUILD | 4 +-- v3.16/kubernetes/APKBUILD | 4 +-- v3.16/nvidia-container-toolkit/APKBUILD | 2 +- .../oci-nvidia-hook.json | 2 +- 8 files changed, 56 insertions(+), 26 deletions(-) create mode 100644 v3.15/.gitignore create mode 100644 v3.16/.gitignore diff --git a/.gitignore b/.gitignore index 5aad05d..5f95787 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ aports distfiles packages -work diff --git a/Makefile b/Makefile index 8a452a3..3d70479 100644 --- a/Makefile +++ b/Makefile @@ -1,40 +1,33 @@ -BUILDER := v3.16.0 +BUILDER := v3.16.2 RELEASE := v3.16 PKG := '*' CF_DIST := E1YFUJXMCXT2RN -.PHONY: builder aports_update download upload +.PHONY: builder aports download upload packages all: build packages: - mkdir -p packages + mkdir -p packages/$(RELEASE)/aarch64 packages/$(RELEASE)/x86_64 + distfiles: mkdir -p distfiles -work: - mkdir -p work aports: - git clone https://gitlab.alpinelinux.org/alpine/aports.git --depth=1 - -aports_update: aports - GIT_DIR=aports/.git cd aports; git reset --hard - GIT_DIR=aports/.git cd aports; git fetch origin -p - GIT_DIR=aports/.git cd aports; git pull -p --squash origin master + [ -d aports/.git ] && { GIT_DIR=aports/.git cd aports; git pull; } \ + || git clone https://gitlab.alpinelinux.org/alpine/aports.git # Mounts release into /work of the builder container to build all -build: packages distfiles work - WORKDIR=$$(mktemp -d) && \ +build: packages distfiles podman run -it --rm \ -v ${PWD}/distfiles:/var/cache/distfiles \ -v ${PWD}/packages:/home/alpine/packages \ - -v $$WORKDIR:/home/alpine/work \ - -v ${PWD}/$(RELEASE)/:/home/alpine/src:ro \ + -v ${PWD}/aports:/home/alpine/aports \ + -v ${PWD}/$(RELEASE)/:/home/alpine/$(RELEASE) \ -v ${HOME}/.gitconfig/:/home/alpine/.gitconfig:ro \ -v ${HOME}/.abuild/:/home/alpine/.abuild:ro \ - public.ecr.aws/zero-downtime/alpine-builder:${BUILDER} $(PKG) && \ - doas rm -rf $$WORKDIR + public.ecr.aws/zero-downtime/alpine-builder:${BUILDER} $(PKG) download: aws s3 sync s3://zero-downtime-web/cdn/alpine/$(RELEASE)/kubezero/x86_64/ packages/work/x86_64/ --exclude APKINDEX.tar.gz @@ -43,5 +36,7 @@ invalidate: aws cloudfront create-invalidation --distribution $(CF_DIST) --paths "/alpine/*" upload: invalidate - aws s3 sync --delete packages/work/x86_64/ s3://zero-downtime-web/cdn/alpine/$(RELEASE)/kubezero/x86_64/ --exclude APKINDEX.tar.gz - aws s3 cp packages/work/x86_64/APKINDEX.tar.gz s3://zero-downtime-web/cdn/alpine/$(RELEASE)/kubezero/x86_64/ --cache-control max-age=1 + aws s3 sync --delete packages/$(RELEASE)/x86_64/ s3://zero-downtime-web/cdn/alpine/$(RELEASE)/kubezero/x86_64/ --exclude APKINDEX.tar.gz + aws s3 sync --delete packages/$(RELEASE)/aarch64/ s3://zero-downtime-web/cdn/alpine/$(RELEASE)/kubezero/aarch64/ --exclude APKINDEX.tar.gz + aws s3 cp packages/$(RELEASE)/x86_64/APKINDEX.tar.gz s3://zero-downtime-web/cdn/alpine/$(RELEASE)/kubezero/x86_64/ --cache-control max-age=1 + aws s3 cp packages/$(RELEASE)/aarch64/APKINDEX.tar.gz s3://zero-downtime-web/cdn/alpine/$(RELEASE)/kubezero/aarch64/ --cache-control max-age=1 diff --git a/v3.15/.gitignore b/v3.15/.gitignore new file mode 100644 index 0000000..43fb11d --- /dev/null +++ b/v3.15/.gitignore @@ -0,0 +1,18 @@ +*.apk +*.gz +*.tgz +*.bz2 +*.tbz2 +*.zip +*.tags +*.xz +*.part +*.tar +src +pkg +pkg-* +tmp +build.log +core +!core/ +.vscode/ diff --git a/v3.16/.gitignore b/v3.16/.gitignore new file mode 100644 index 0000000..43fb11d --- /dev/null +++ b/v3.16/.gitignore @@ -0,0 +1,18 @@ +*.apk +*.gz +*.tgz +*.bz2 +*.tbz2 +*.zip +*.tags +*.xz +*.part +*.tar +src +pkg +pkg-* +tmp +build.log +core +!core/ +.vscode/ diff --git a/v3.16/fluent-bit/APKBUILD b/v3.16/fluent-bit/APKBUILD index ef5ab81..1777856 100644 --- a/v3.16/fluent-bit/APKBUILD +++ b/v3.16/fluent-bit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Stefan Reimer # Maintainer: Stefan Reimer pkgname=fluent-bit -pkgver=1.9.8 +pkgver=1.9.9 pkgrel=0 pkgdesc="Fast and Lightweight Log processor and forwarder" url="https://fluentbit.io/" @@ -82,7 +82,7 @@ package() { } sha512sums=' -2beb52c3043345e9b8c6abdb3e6c5382c77bc68f2962d9faefee085e7ff6f17f417fa8d8940227b256dbf28f91a8dddd2d2b6d369f413d94fe8d9fd8049fbc8c fluent-bit-1.9.8.tar.gz +95ff8353153cc1a45bc17c834633f57ad1dc4805351c59172c34c853a47b7fb0484d4dd6aae016a83b5c3324f4d0704143a1e63a2f91b4d18d086adac4d7740b fluent-bit-1.9.9.tar.gz f6431397c80a036980b5377b51e38aec25dfceeb8dbe4cd54dce1f6e77d669d9f8daf983fcc96d25332385888f1809ced5e8ab0e8ccfcd93d19494036e3dc949 fluent-bit.confd 8ba6c8e84dee90176f9b4375fb2c6444fa5d32fa601d9bcf3ea7960fec87f1ef664f175caf08bd0b052843e971efdbf08e2a5cd180ad9a8f23ff2c5cb233814f fluent-bit.initd 6bd7d8b4da93a17f29b6ea1e0286ea226d0e376024284741110936779b3229bd8d6cd03ffbdc5d3b4842294e7f32a888de0dd16b0851b65d91b062ca58530ea0 chunkio-static-lib-fts.patch diff --git a/v3.16/kubernetes/APKBUILD b/v3.16/kubernetes/APKBUILD index db12669..a2966ed 100644 --- a/v3.16/kubernetes/APKBUILD +++ b/v3.16/kubernetes/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Dave # Maintainer: Francesco Colista pkgname=kubernetes -pkgver=1.23.10 +pkgver=1.23.11 pkgrel=0 pkgdesc="Container Cluster Manager" url="https://kubernetes.io/" @@ -203,7 +203,7 @@ _do_zshcomp() { } sha512sums=' -9535a3adfd1769ded3c427ba5536bd497d0d30f3df81c41c554a562b67d0c356326730b18f641687be9e482be9b6e76320f4ce31f3c81b7d3a5a0fa7c13fe872 kubernetes-1.23.10.tar.gz +160da70eca160875f348e54852bcbf248a5308c4f547b4d0c19d714618b329ee998cb7dda5aac396ece9f4d11d21c74b0cd781de96572193481a3183bd393de2 kubernetes-1.23.11.tar.gz c350bb0a63ada0cc3657fe07598101775243083aa1eabda898080b7b01b129e6fdd7ad1a61950cc039b73b081f38de3b856baedf5c075f39916be1547b11d184 make-e2e_node-run-over-distro-bins.patch 56201491d2dfe3a487931cbf5c6e60af898701b9541a936d80e3823948fcfb98508e3d51f4aaa415ce971f7bd20a7b51f74f025c76b83f58d5a8de8ce0ab679b make-test-cmd-run-over-hyperkube-based-kubectl.patch e690daff2adb1013c92124f32e71f8ed9a18c611ae6ae5fcb5ce9674768dbf9d911a05d7e4028488cda886e63b82e8ac0606d14389a05844c1b5538a33dd09d1 kube-apiserver.initd diff --git a/v3.16/nvidia-container-toolkit/APKBUILD b/v3.16/nvidia-container-toolkit/APKBUILD index 84ef18c..e719f4e 100644 --- a/v3.16/nvidia-container-toolkit/APKBUILD +++ b/v3.16/nvidia-container-toolkit/APKBUILD @@ -74,5 +74,5 @@ c5369c832bd91703e6e6e86a4431c2eebb2ddeaadff126174b41ed11e969dc8cc49dcab26b3ac18a 694a3ec64ef3056d5874ff03b889b868c294bccb16506468fdf1c289fe3aaadc2da25a5934de653af9633a5d993d2bb21491d84b3b2e2529e6b31d92c78a2228 libcap2_2.25-2_amd64.deb 5a4eaa96e6e774948889909d618a8ed44a82f649cbba11622dc7b4478098bea006995d5a5a60ca026a57b76ad866d1e2c6caebd154a26eb6bd7e15291b558057 libseccomp2_2.3.3-4_amd64.deb 040ac2e3f58549dc09e5bce0d694e4be2f6aae736014bf0ee90042646562d5f1ef1f5990eb9f2c2a2fdf504587b82f4aa0eb99d04c5d3e407670e4012e3edd4e config.toml -fe02a2749c18876eda344764026c0cabae1134cd9504d92e877000c000c99783ee7d3af16e1981c85a4e7bad0951060b88028d0576aa17bfae7d241838b86fb6 oci-nvidia-hook.json +cf5673231d1862e3ec03f792cddf54ff27237656f762c3f42b6d7e1584de2201c487861ac399ab26951b5dbf3e3cd9b4451dbf61f02b55e0991889b507319764 oci-nvidia-hook.json ' diff --git a/v3.16/nvidia-container-toolkit/oci-nvidia-hook.json b/v3.16/nvidia-container-toolkit/oci-nvidia-hook.json index 4b5ff39..c547dd7 100644 --- a/v3.16/nvidia-container-toolkit/oci-nvidia-hook.json +++ b/v3.16/nvidia-container-toolkit/oci-nvidia-hook.json @@ -6,7 +6,7 @@ }, "when": { "always": true, - "commands": ["nvidia.*"] + "commands": [".*"] }, "stages": ["prestart"] }