Skip to content

Commit dbbff24

Browse files
committed
refact: delete old image
1 parent bf0d9dc commit dbbff24

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

‎system/cuos/app-init.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,10 @@ if ! docker ps --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}\$"; then
184184
fi
185185

186186
if [[ "${UPDATE}" -eq 1 ]]; then
187+
if [[ -n "${OLD_IMAGE_PATH}" && "${OLD_IMAGE_PATH}" != "${INITIAL_IMAGE}" ]]; then
188+
docker image rm "${OLD_IMAGE_PATH}" || true
189+
fi
190+
187191
docker exec "${CONTAINER_NAME}" /api/post_update || true
188192

189193
report_notice "cuos:update:done" "System successfully updated."

‎updater/perform_update.sh‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ raise_info() {
3232

3333
# Check parameters:
3434
SLOT="A"
35+
OLD_SLOT="B"
3536
# $1 is current slot:
3637
if [[ "$1" = "A" ]]; then
3738
SLOT="B"
39+
OLD_SLOT="A"
3840
fi
3941

4042
IMAGE="${2}"
@@ -71,8 +73,12 @@ rm -f "${TARGET_BOOT}/${SLOT}"_* || true
7173

7274
docker rm -f "${CONTAINER_NAME_OLD}" >/dev/null 2>/dev/null || true
7375

74-
docker rm -f "${CONTAINER_NAME}" >/dev/null 2>/dev/null && \
75-
docker image prune -a -f || true
76+
docker rm -f "${CONTAINER_NAME}" >/dev/null 2>/dev/null || true
77+
78+
OLD_CONTAINER_NAME="cuos-system-${OLD_SLOT}"
79+
if OLD_IMAGE_PATH="$(docker inspect --format='{{.Image}}' "${OLD_CONTAINER_NAME}")"; then
80+
docker image rm "${OLD_IMAGE_PATH}" || true
81+
fi
7682

7783
# Load new image
7884
docker image pull "${IMAGE}" >/dev/null \

0 commit comments

Comments
 (0)