From 64e713d5f09b6a04feb4f87d072f709453b1e995 Mon Sep 17 00:00:00 2001 From: TheHolyRoger Date: Fri, 19 May 2023 11:07:27 +0100 Subject: [PATCH] Switch docker image from mqtt back to latest --- VERSION | 2 +- docker-compose.yml | 2 +- scripts/dev/start_docker.sh | 2 +- scripts/setup_config.sh | 2 +- scripts/start_docker.bat | 2 +- scripts/start_docker.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index 10bf840..f93ea0c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.1 \ No newline at end of file +2.0.2 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 4f6b06f..d8b33f3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,7 +47,7 @@ services: - ./data/certbot/www:/var/www/certbot rogerthat: build: . - image: "theholiestroger/rogerthat:${ROGERTHAT_IMG_NAME:-mqtt}" + image: "theholiestroger/rogerthat:${ROGERTHAT_IMG_NAME:-latest}" stop_signal: SIGINT extra_hosts: - "host.docker.internal:host-gateway" diff --git a/scripts/dev/start_docker.sh b/scripts/dev/start_docker.sh index fb18778..90339e1 100755 --- a/scripts/dev/start_docker.sh +++ b/scripts/dev/start_docker.sh @@ -51,7 +51,7 @@ if [ "${dockerprune} " == "1 " ]; then echo "Pruning docker." docker system prune -f docker rmi theholiestroger/nginx-iptables:latest || true - docker rmi "theholiestroger/rogerthat:${ROGERTHAT_IMG_NAME:-mqtt}" || true + docker rmi "theholiestroger/rogerthat:${ROGERTHAT_IMG_NAME:-latest}" || true fi if [ "${dontbuild} " == "1 " ]; then diff --git a/scripts/setup_config.sh b/scripts/setup_config.sh index 2d68290..81a7e6c 100755 --- a/scripts/setup_config.sh +++ b/scripts/setup_config.sh @@ -16,6 +16,6 @@ mkdir -p ./data/certbot/www docker run -it --rm \ --volume "$(pwd)/configs:/configs" \ -"theholiestroger/rogerthat:${ROGERTHAT_IMG_NAME:-mqtt}" \ +"theholiestroger/rogerthat:${ROGERTHAT_IMG_NAME:-latest}" \ ./docker_start_setup_script.sh \ "$@" diff --git a/scripts/start_docker.bat b/scripts/start_docker.bat index 7e70881..5df4b33 100755 --- a/scripts/start_docker.bat +++ b/scripts/start_docker.bat @@ -26,7 +26,7 @@ docker run -it --rm ^ --volume "./logs:/logs" ^ --entrypoint "/bin/bash" ^ --user root ^ -"theholiestroger/rogerthat:mqtt" ^ +"theholiestroger/rogerthat:latest" ^ "-l" "-c" "chown -R rogerthat:rogerthat /configs /logs; chown -R 999:999 /data" REM Run setup script via docker diff --git a/scripts/start_docker.sh b/scripts/start_docker.sh index eb9b71f..88c5743 100755 --- a/scripts/start_docker.sh +++ b/scripts/start_docker.sh @@ -72,7 +72,7 @@ docker run -it --rm \ --volume "$(pwd)/logs:/logs" \ --entrypoint "/bin/bash" \ --user root \ -"theholiestroger/rogerthat:${ROGERTHAT_IMG_NAME:-mqtt}" \ +"theholiestroger/rogerthat:${ROGERTHAT_IMG_NAME:-latest}" \ "-l" "-c" "chown -R rogerthat:rogerthat /configs /logs; chown -R ${PUID:-999}:${PGID:-999} /data" # Run setup script via docker