Merge pull request #115 from rancher-sandbox/zoneinfo

Add option to install /usr/share/zoneinfo data

Author: AkihiroSuda

edition/min

@@ -17,4 +17,5 @@ export LIMA_INSTALL_NERDCTL_FULL=false
 export LIMA_INSTALL_OPENSSH_SFTP_SERVER=false
 export LIMA_INSTALL_SSHFS=false
 export LIMA_INSTALL_TINI=false
+export LIMA_INSTALL_TZDATA=false
 export LIMA_INSTALL_ZSTD=false

edition/std

@@ -10,3 +10,4 @@ LIMA_INSTALL_LOGROTATE=true
 LIMA_INSTALL_OPENSSH_SFTP_SERVER=true
 LIMA_INSTALL_SSHFS=true
 LIMA_INSTALL_TINI=true
+LIMA_INSTALL_TZDATA=true

genapkovl-lima.sh

@@ -282,6 +282,10 @@ if [ "${LIMA_INSTALL_TINI}" == "true" ]; then
     ln -sf /sbin/tini-static "$tmp"/usr/bin/tini
 fi
 
+if [ "${LIMA_INSTALL_TZDATA}" == "true" ]; then
+    echo tzdata >> "$tmp"/etc/apk/world
+fi
+
 if [ "${LIMA_INSTALL_CRI_DOCKERD}" == "true" ]; then
     mkdir -p "${tmp}/cri-dockerd"
     tar xz -C "${tmp}/cri-dockerd" -f /home/build/cri-dockerd.tar.gz

lima-init.sh

@@ -21,6 +21,14 @@ while read -r line; do export "$line"; done <"${LIMA_CIDATA_MNT}"/lima.env
 LIMA_CIDATA_HOSTNAME="$(awk '/^local-hostname:/ {print $2}' "${LIMA_CIDATA_MNT}"/meta-data)"
 hostname "${LIMA_CIDATA_HOSTNAME}"
 
+# Set timezone
+LIMA_CIDATA_TIMEZONE="$(awk '/^timezone:/ {print $2}' "${LIMA_CIDATA_MNT}"/user-data)"
+if [ -n "${LIMA_CIDATA_TIMEZONE}" ]; then
+    if setup-timezone "${LIMA_CIDATA_TIMEZONE}"; then
+        echo "${LIMA_CIDATA_TIMEZONE}" >/etc/timezone
+    fi
+fi
+
 # Create user
 LIMA_CIDATA_HOMEDIR="/home/${LIMA_CIDATA_USER}.linux"
 useradd --home-dir "${LIMA_CIDATA_HOMEDIR}" --create-home --uid "${LIMA_CIDATA_UID}" "${LIMA_CIDATA_USER}"

mkimg.lima.sh

@@ -64,6 +64,9 @@ profile_lima() {
         if [ "${LIMA_INSTALL_IPTABLES}" == "true" ] || [ "${LIMA_INSTALL_NERDCTL_FULL}" == "true" ]; then
             apks="$apks iptables ip6tables"
         fi
+        if [ "${LIMA_INSTALL_TZDATA}" == "true" ]; then
+            apks="$apks tzdata"
+        fi
         if [ "${LIMA_INSTALL_ZSTD}" == "true" ]; then
             apks="$apks zstd"
         fi