diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4819fa5..f84fd51 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: pull_request: env: - ALPINE_VERSION: 3.18.0 + ALPINE_VERSION: 3.19.0 DOCKER_BUILDKIT: 1 jobs: @@ -17,7 +17,7 @@ jobs: timeout-minutes: 60 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 1 submodules: recursive diff --git a/Makefile b/Makefile index 44a1e02..4c5905f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -ALPINE_VERSION ?= 3.18.0 +ALPINE_VERSION ?= 3.19.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/build.sh b/build.sh index d866949..817589d 100755 --- a/build.sh +++ b/build.sh @@ -22,7 +22,6 @@ ${DOCKER} run --rm \ -v "${PWD}/qemu-${QEMU_VERSION}-copying:/home/build/qemu-copying:ro" \ -v "${PWD}/cri-dockerd-${CRI_DOCKERD_VERSION}-${ARCH}:/home/build/cri-dockerd.tar.gz:ro" \ -v "${PWD}/cri-dockerd-${CRI_DOCKERD_VERSION}-${ARCH}.LICENSE:/home/build/cri-dockerd.license:ro" \ - -v "${PWD}/sshd.pam:/home/build/sshd.pam:ro" \ $(env | grep ^LIMA_ | xargs -n 1 printf -- '-e %s ') \ -e "LIMA_REPO_VERSION=${REPO_VERSION}" \ -e "LIMA_BUILD_ID=${BUILD_ID}" \ diff --git a/genapkovl-lima.sh b/genapkovl-lima.sh index b1b325c..d2bff87 100755 --- a/genapkovl-lima.sh +++ b/genapkovl-lima.sh @@ -44,7 +44,7 @@ EOF mkdir -p "$tmp"/etc/apk makefile root:root 0644 "$tmp"/etc/apk/world <