From 46c4326a3d8effd9bb2262fe9f244668e94a98aa Mon Sep 17 00:00:00 2001 From: Maaike Date: Tue, 14 Jan 2025 10:47:21 +0100 Subject: [PATCH] don't manage wis2downloader in wis2box-release as requested by David Berry --- docker-compose.base.yml | 2 +- wis2box-ctl.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-compose.base.yml b/docker-compose.base.yml index 1758dc78..c755ec92 100644 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -155,7 +155,7 @@ services: wis2downloader: container_name: wis2downloader - image: wmoim/wis2downloader:latest + image: wmoim/wis2downloader:v0.3.2 restart: always env_file: - wis2box.env diff --git a/wis2box-ctl.py b/wis2box-ctl.py index bef73c0b..8616322f 100755 --- a/wis2box-ctl.py +++ b/wis2box-ctl.py @@ -194,7 +194,7 @@ def update_docker_images(use_local_build: bool = False, use_latest: bool = False lines = f.readlines() with open('docker-compose.yml', 'w') as f: for line in lines: - if 'image: wmoim/' in line: + if 'image: wmoim/wis2box' in line: image = line.split('wmoim/')[1].split(':')[0] # determine the tag to use @@ -321,8 +321,8 @@ def make(args) -> None: f'{DOCKER_COMPOSE_COMMAND} {docker_compose_args} up -d')) # perform cleanup of images after update, unless updating local build if not args.command == "update-local-build": - remove_docker_images('wmoim/wis2*') - remove_docker_images('ghcr.io/wmo-im/wis2*') + remove_docker_images('wmoim/wis2box*') + remove_docker_images('ghcr.io/wmo-im/wis2box*') elif args.command == "execute": run(['docker', 'exec', '-i', 'wis2box-management', 'sh', '-c', containers]) elif args.command == "login": @@ -342,10 +342,10 @@ def make(args) -> None: run(split('docker builder prune -f')) run(split('docker container prune -f')) run( split('docker volume prune -f')) - # prune any unused images starting with wmoim/wis2 - remove_docker_images('wmoim/wis2*') - # prune any unused images starting with ghcr.io/wmo-im/wis2 - remove_docker_images('ghcr.io/wmo-im/wis2*') + # prune any unused images starting with wmoim/wis2box + remove_docker_images('wmoim/wis2box*') + # prune any unused images starting with ghcr.io/wmo-im/wis2box + remove_docker_images('ghcr.io/wmo-im/wis2box*') elif args.command == "restart": if containers: run(split(