Merge pull request #9 from rancher-sandbox/alpine-3.16

jandubois · web-flow · commit 8dc76da8f387 · 2023-03-02T11:36:02.000-08:00
Revert to Alpine 3.16
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
   pull_request:
 
 env:
-  ALPINE_VERSION: 3.17.0
+  ALPINE_VERSION: 3.16.0
   DOCKER_BUILDKIT: 1
 
 jobs:
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-ALPINE_VERSION ?= 3.17.0
+ALPINE_VERSION ?= 3.16.0
 REPO_VERSION ?= $(shell echo "$(ALPINE_VERSION)" | sed -E 's/^([0-9]+\.[0-9]+).*/v\1/')
 GIT_TAG ?= $(shell echo "v$(ALPINE_VERSION)" | sed 's/^vedge$$/origin\/master/')
 BUILD_ID ?= $(shell git describe --tags)
diff --git a/genapkovl-lima.sh b/genapkovl-lima.sh
@@ -221,6 +221,8 @@ if [ "${LIMA_INSTALL_CNI_PLUGIN_FLANNEL}" == "true" ]; then
     if [ "$(uname -m)" == "aarch64" ]; then
         ARCH=arm64
     fi
+    mkdir -p "${tmp}/usr/libexec/cni"
+    ln -s "flannel-${ARCH}" "${tmp}/usr/libexec/cni/flannel"
 fi
 
 if [ "${LIMA_INSTALL_CURL}" == "true" ]; then
diff --git a/src/aports b/src/aports
@@ -1 +1 @@
-Subproject commit fea827d99a2ecc4267bf7184abaaeec2ab7108e2
+Subproject commit e2c6d5931e7fd56ac46def042ece5552df79d7c6

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ALPINE_VERSION ?= 3.17.0`
	`1`	`+ALPINE_VERSION ?= 3.16.0`
`2`	`2`	`REPO_VERSION ?= $(shell echo "$(ALPINE_VERSION)" \| sed -E 's/^([0-9]+\.[0-9]+).*/v\1/')`
`3`	`3`	`GIT_TAG ?= $(shell echo "v$(ALPINE_VERSION)" \| sed 's/^vedge$$/origin\/master/')`
`4`	`4`	`BUILD_ID ?= $(shell git describe --tags)`