From bdf5dbf27f99cccc0548aaba6f5ae6d03d9f399e Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 18 Aug 2022 17:42:59 +0200 Subject: [PATCH] feat: kubernetes version bump to 1.23.10, latest docker registry package to support AWS EC2 etc --- v3.16/docker-registry/APKBUILD | 63 +++++++++++++++++++ v3.16/docker-registry/config-example.patch | 19 ++++++ v3.16/docker-registry/docker-registry.initd | 27 ++++++++ .../docker-registry.pre-install | 6 ++ v3.16/kubernetes/APKBUILD | 4 +- 5 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 v3.16/docker-registry/APKBUILD create mode 100644 v3.16/docker-registry/config-example.patch create mode 100644 v3.16/docker-registry/docker-registry.initd create mode 100644 v3.16/docker-registry/docker-registry.pre-install diff --git a/v3.16/docker-registry/APKBUILD b/v3.16/docker-registry/APKBUILD new file mode 100644 index 0000000..2ddddd9 --- /dev/null +++ b/v3.16/docker-registry/APKBUILD @@ -0,0 +1,63 @@ +# Contributor: Christian Kampka +# Maintainer: +pkgname=docker-registry +pkgver=2.9.0_git20220818 +pkgrel=1 +pkgdesc="An implementation of the Docker Registry HTTP API V2 for use with docker 1.6+" +url="https://github.com/distribution/distribution" +# riscv64 blocked by dependency panicwrap +arch="all !s390x !riscv64" +license="Apache-2.0" +makedepends="git go" +install="$pkgname.pre-install" +pkgusers="docker-registry" +pkggroups="docker-registry" +subpackages="$pkgname-openrc" +#source="$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz +source="$pkgname-$pkgver.tar.gz::$url/archive/6c237953cbbe9ae855e483c59d9085fb1c8aa01b.tar.gz + docker-registry.initd + config-example.patch" +builddir="$srcdir/src/github.com/docker/distribution" +options="chmod-clean" + +prepare() { + mkdir -p "${builddir%/*}" + #mv "$srcdir"/distribution-$pkgver "$builddir" + mv "$srcdir"/distribution-6c237953cbbe9ae855e483c59d9085fb1c8aa01b "$builddir" +} + +build() { + make binaries \ + DISTRIBUTION_DIR="$builddir" \ + VERSION="$pkgver" \ + REVISION="$pkgrel" \ + GOFLAGS="-buildmode=pie" \ + GOLDFLAGS="-extldflags=-static -w -s" +} + +check() { + ./bin/registry --version +} + +package() { + install -D -m 755 bin/registry \ + "$pkgdir"/usr/bin/$pkgname + + install -D -m 644 cmd/registry/config-example.yml \ + "$pkgdir"/etc/$pkgname/config.yml + + install -D -m 644 LICENSE \ + "$pkgdir"/usr/share/licenses/$pkgname + + install -D -m 755 "$srcdir"/$pkgname.initd \ + "$pkgdir"/etc/init.d/$pkgname + + install -d -m 750 -o $pkgusers -g $pkggroups \ + "$pkgdir"/var/lib/$pkgname +} + +sha512sums=" +78cc813422eda98495592c6b6c005e90d4beb922b7d27c10308c62bb4fce4b1fc804663ba3e0bccc043b9d69893d83ce40f6b33351c3f854c874627356377a17 docker-registry-2.9.0_git20220818.tar.gz +96100a4de311afa19d293a3b8a63105e1fcdf49258aa8b1752befd389e6b4a2b1f70711341ea011b450d4468bd37dbd07a393ffab3b9aa1b2213cf0fdd915904 docker-registry.initd +5a38f4d3f0ee5cd00c0a5ced744eb5b29b839da5921adea26c5de3eb88b6b2626a7ba29b1ab931e5f8fbfafbed8c94cb972a58737ec0c0a69cf515c32139e387 config-example.patch +" diff --git a/v3.16/docker-registry/config-example.patch b/v3.16/docker-registry/config-example.patch new file mode 100644 index 0000000..b07c96d --- /dev/null +++ b/v3.16/docker-registry/config-example.patch @@ -0,0 +1,19 @@ +--- a/cmd/registry/config-example.yml ++++ b/cmd/registry/config-example.yml +@@ -6,7 +6,7 @@ + cache: + blobdescriptor: inmemory + filesystem: +- rootdirectory: /var/lib/registry ++ rootdirectory: /var/lib/docker-registry + http: + addr: :5000 + headers: +@@ -16,3 +16,7 @@ + enabled: true + interval: 10s + threshold: 3 ++ ++# Uncomment to use this Registry as pull-through cache for DockerHub. ++#proxy: ++# remoteurl: https://registry-1.docker.io diff --git a/v3.16/docker-registry/docker-registry.initd b/v3.16/docker-registry/docker-registry.initd new file mode 100644 index 0000000..a800f2e --- /dev/null +++ b/v3.16/docker-registry/docker-registry.initd @@ -0,0 +1,27 @@ +#!/sbin/openrc-run + +# These awfully long uppercase variables are here only for backward +# compatibility. Do not use them! +: ${logfile:=${DOCKER_REGISTRY_LOGFILE:-"/var/log/docker-registry.log"}} +: ${conffile:=${DOCKER_REGISTRY_CONFIG:-"/etc/docker-registry/config.yml"}} +: ${user:="docker-registry"} +: ${group:="$user"} + +name="Docker Registry" + +command="/usr/bin/docker-registry" +command_args="serve $conffile" +command_background="yes" + +pidfile="/run/$RC_SVCNAME.pid" +start_stop_daemon_args=" + --user $user:$group + --stdout $logfile + --stderr $logfile" + +required_files="$conffile" + +start_pre() { + checkpath -d -m 0770 -o "$user:$group" /var/lib/registry + checkpath -f -m 0644 -o "$user:$group" "$logfile" +} diff --git a/v3.16/docker-registry/docker-registry.pre-install b/v3.16/docker-registry/docker-registry.pre-install new file mode 100644 index 0000000..8c1c986 --- /dev/null +++ b/v3.16/docker-registry/docker-registry.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S docker-registry 2>/dev/null +adduser -S -D -H -h /dev/null -s /sbin/nologin -G docker-registry -g docker-registry docker-registry 2>/dev/null + +exit 0 diff --git a/v3.16/kubernetes/APKBUILD b/v3.16/kubernetes/APKBUILD index 291135a..db12669 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.9 +pkgver=1.23.10 pkgrel=0 pkgdesc="Container Cluster Manager" url="https://kubernetes.io/" @@ -203,7 +203,7 @@ _do_zshcomp() { } sha512sums=' -e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f kubernetes-1.23.9.tar.gz +9535a3adfd1769ded3c427ba5536bd497d0d30f3df81c41c554a562b67d0c356326730b18f641687be9e482be9b6e76320f4ce31f3c81b7d3a5a0fa7c13fe872 kubernetes-1.23.10.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