Skip to content

Commit

Permalink
don't manage wis2downloader in wis2box-release as requested by David …
Browse files Browse the repository at this point in the history
…Berry
  • Loading branch information
maaikelimper committed Jan 14, 2025
1 parent f859302 commit 46c4326
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docker-compose.base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions wis2box-ctl.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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":
Expand All @@ -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(
Expand Down

0 comments on commit 46c4326

Please sign in to comment.