Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Alpine 3.19 #117

Merged
merged 3 commits into from
Jan 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
pull_request:

env:
ALPINE_VERSION: 3.18.0
ALPINE_VERSION: 3.19.0
DOCKER_BUILDKIT: 1

jobs:
Expand All @@ -17,7 +17,7 @@ jobs:
timeout-minutes: 60

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: recursive
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
1 change: 0 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}" \
Expand Down
5 changes: 1 addition & 4 deletions genapkovl-lima.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ EOF
mkdir -p "$tmp"/etc/apk
makefile root:root 0644 "$tmp"/etc/apk/world <<EOF
alpine-base
openssh-server-pam
openssh-server
EOF

rc_add devfs sysinit
Expand Down Expand Up @@ -99,9 +99,6 @@ EOF

rc_add lima-overlay default

mkdir -p "$tmp"/etc/pam.d
cp /home/build/sshd.pam "${tmp}/etc/pam.d/sshd"

if [ "${LIMA_INSTALL_LIMA_INIT}" == "true" ]; then
rc_add lima-init default
rc_add lima-init-local default
Expand Down
2 changes: 1 addition & 1 deletion mkimg.lima.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ profile_lima() {
kernel_cmdline="console=hvc0 console=tty0 console=ttyS0,115200"
syslinux_serial="0 115200"
apkovl="genapkovl-lima.sh"
apks="$apks openssh-server-pam"
apks="$apks openssh-server"
if [ "${LIMA_INSTALL_CA_CERTIFICATES}" == "true" ]; then
apks="$apks ca-certificates"
fi
Expand Down
2 changes: 1 addition & 1 deletion src/aports
Submodule aports updated 12124 files
4 changes: 0 additions & 4 deletions sshd.pam

This file was deleted.