Merge pull request #129 from rancher-sandbox/alpine-3.20

jandubois · web-flow · commit 99d3e0a4f20f · 2024-05-31T13:09:39.000-07:00
Bump Alpine 3.19 → 3.20
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
   pull_request:
 
 env:
-  ALPINE_VERSION: 3.19.0
+  ALPINE_VERSION: 3.20.0
   DOCKER_BUILDKIT: 1
 
 jobs:
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-ALPINE_VERSION ?= 3.19.0
+ALPINE_VERSION ?= 3.20.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/src/aports b/src/aports
@@ -1 +1 @@
-Subproject commit d01502332b773d59a09220aac959a3c18c429ce3
+Subproject commit 1402388a3a746e9961791846350e35f1d4d4618d

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ALPINE_VERSION ?= 3.19.0`
	`1`	`+ALPINE_VERSION ?= 3.20.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)`