Dave Jarvis' Repositories

git clone https://repo.autonoma.ca/repo/keenwrite.git

Updates logging, adds comments

AuthorDaveJarvis <email>
Date2022-12-11 19:02:25 GMT-0800
Commit79970ae9655a0af229ef6e69ee200b8dbe1c112f
Parent3e14390
container/Containerfile
+# ########################################################################
+#
+# Copyright 2022 White Magic Software, Ltd.
+#
+# Creates a container image that can run ConTeXt to typeset documents.
+#
+# ########################################################################
+
FROM alpine:latest
ENV ENV="/etc/profile"
# ########################################################################
#
-# Download and install themes
+# Download and extract themes
#
# ########################################################################
container/manage.sh
source ../scripts/build-template
+readonly BUILD_DIR=build
readonly CONTAINER_NAME=typesetter
readonly CONTAINER_NETWORK=host
-readonly CONTAINER_FILE=${CONTAINER_NAME}
-readonly CONTAINER_ARCHIVE_FILE=${CONTAINER_FILE}.tar
-readonly CONTAINER_COMPRESSED_FILE=${CONTAINER_ARCHIVE_FILE}.gz
+readonly CONTAINER_FILE="${CONTAINER_NAME}"
+readonly CONTAINER_ARCHIVE_FILE="${CONTAINER_FILE}.tar"
+readonly CONTAINER_COMPRESSED_FILE="${CONTAINER_ARCHIVE_FILE}.gz"
readonly CONTAINER_EXE=podman
+readonly CONTAINER_COMPRESSED_PATH="${BUILD_DIR}/${CONTAINER_ARCHIVE_FILE}.gz"
DEPENDENCIES=(
"b,build,Build container image (${CONTAINER_NAME})"
"c,connect,Connect to container image"
- "l,load,Load container image (${CONTAINER_COMPRESSED_FILE})"
+ "l,load,Load container image (${CONTAINER_COMPRESSED_PATH})"
"r,remove,Remove all container images"
- "s,save,Save container image (${CONTAINER_COMPRESSED_FILE})"
+ "s,save,Save container image (${CONTAINER_COMPRESSED_PATH})"
)
# ---------------------------------------------------------------------------
utile_save() {
- if [[ -f "${CONTAINER_COMPRESSED_FILE}" ]]; then
- warning "${CONTAINER_COMPRESSED_FILE} exists, delete before saving."
+ if [[ -f "${CONTAINER_COMPRESSED_PATH}" ]]; then
+ warning "${CONTAINER_COMPRESSED_PATH} exists, delete before saving."
else
- $log "Saving ${CONTAINER_NAME} image ..."
+ $log "Saving ${CONTAINER_NAME} image"
+
+ mkdir -p "${BUILD_DIR}"
${CONTAINER_EXE} save \
--quiet \
- -o "${CONTAINER_ARCHIVE_FILE}" \
+ -o "${BUILD_DIR}/${CONTAINER_ARCHIVE_FILE}" \
"${CONTAINER_NAME}"
- $log "Compressing to ${CONTAINER_COMPRESSED_FILE} ..."
- gzip "${CONTAINER_ARCHIVE_FILE}"
+ $log "Compressing to ${CONTAINER_COMPRESSED_PATH}"
+ gzip "${CONTAINER_ARCHIVE_PATH}"
$log "Saved ${CONTAINER_NAME} image"
fi
}
# ---------------------------------------------------------------------------
# Loads the container from a file
# ---------------------------------------------------------------------------
utile_load() {
- if [[ -f "${CONTAINER_COMPRESSED_FILE}" ]]; then
- $log "Loading ${CONTAINER_NAME} image ..."
+ if [[ -f "${CONTAINER_COMPRESSED_PATH}" ]]; then
+ $log "Loading ${CONTAINER_NAME} image from ${CONTAINER_COMPRESSED_PATH}"
${CONTAINER_EXE} load \
--quiet \
- -i "${CONTAINER_COMPRESSED_FILE}"
+ -i "${CONTAINER_COMPRESSED_PATH}"
$log "Loaded ${CONTAINER_NAME} image"
else
- warning "Missing ${CONTAINER_COMPRESSED_FILE}; use build follwed by save"
+ warning "Missing ${CONTAINER_COMPRESSED_PATH}; use build follwed by save"
fi
}
Delta28 lines added, 16 lines removed, 12-line increase