Skip to content

Commit

Permalink
Merge pull request #3 from rancher-sandbox/ca-certificates
Browse files Browse the repository at this point in the history
Install ca-certificates package into std edition
  • Loading branch information
jandubois authored Jul 9, 2021
2 parents dd00775 + 92eba01 commit 0554f48
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
1 change: 1 addition & 0 deletions edition/min
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export LIMA_INSTALL_CA_CERTIFICATES=false
export LIMA_INSTALL_CLOUD_INIT=false
export LIMA_INSTALL_LIMA_INIT=false
export LIMA_INSTALL_BINFMT_MISC=false
Expand Down
1 change: 1 addition & 0 deletions edition/std
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
source edition/min
LIMA_INSTALL_LIMA_INIT=true
LIMA_INSTALL_BINFMT_MISC=true
LIMA_INSTALL_CA_CERTIFICATES=true
LIMA_INSTALL_SSHFS=true
14 changes: 9 additions & 5 deletions genapkovl-lima.sh
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,6 @@ network: { config: disabled }
EOF
fi

if [ "${LIMA_INSTALL_K3S}" == "true" ]; then
echo "k3s" >> "$tmp"/etc/apk/world
rc_add k3s default
fi

if [ "${LIMA_INSTALL_BINFMT_MISC}" == "true" ]; then
echo "qemu-aarch64" >> "$tmp"/etc/apk/world

Expand All @@ -131,6 +126,15 @@ if [ "${LIMA_INSTALL_BINFMT_MISC}" == "true" ]; then
rc_add qemu-binfmt default
fi

if [ "${LIMA_INSTALL_CA_CERTIFICATES}" == "true" ]; then
echo "ca-certificates" >> "$tmp"/etc/apk/world
fi

if [ "${LIMA_INSTALL_K3S}" == "true" ]; then
echo "k3s" >> "$tmp"/etc/apk/world
rc_add k3s default
fi

if [ "${LIMA_INSTALL_SSHFS}" == "true" ]; then
echo "sshfs" >> "$tmp"/etc/apk/world
fi
Expand Down
3 changes: 3 additions & 0 deletions mkimg.lima.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ profile_lima() {
syslinux_serial="0 115200"
apkovl="genapkovl-lima.sh"
apks="$apks openssh"
if [ "${LIMA_INSTALL_CA_CERTIFICATES}" == "true" ]; then
apks="$apks ca-certificates"
fi
if [ "${LIMA_INSTALL_CLOUD_INIT}" == "true" ]; then
apks="$apks cloud-init"
fi
Expand Down

0 comments on commit 0554f48

Please sign in to comment.