From 071439100ab360edfebc9bb03dbc2e0afc3ba70c Mon Sep 17 00:00:00 2001 From: MarkoSagadin Date: Tue, 9 Jul 2024 09:51:12 +0200 Subject: [PATCH] fix: docker images naming in shell scripts --- vanilla-zephyr/build_ci.sh | 2 +- vanilla-zephyr/build_dev.sh | 4 ++-- vanilla-zephyr/run.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vanilla-zephyr/build_ci.sh b/vanilla-zephyr/build_ci.sh index 6b3481b..d51d924 100755 --- a/vanilla-zephyr/build_ci.sh +++ b/vanilla-zephyr/build_ci.sh @@ -6,4 +6,4 @@ docker build \ --build-arg "ZEPHYR_VERSION=$ZEPHYR_VERSION" \ --build-arg "MCUBOOT_VERSION=$MCUBOOT_VERSION" \ -f "Dockerfile.ci" \ - -t "irnas/vanilla-zephyr-ci-$ZEPHYR_VERSION:latest" . + -t "irnas/vanilla-zephyr-$ZEPHYR_VERSION-ci:latest" . diff --git a/vanilla-zephyr/build_dev.sh b/vanilla-zephyr/build_dev.sh index 83c5a6b..373a10f 100755 --- a/vanilla-zephyr/build_dev.sh +++ b/vanilla-zephyr/build_dev.sh @@ -1,11 +1,11 @@ #! /usr/bin/env bash ZEPHYR_VERSION=v3.6.0 MCUBOOT_VERSION=a4eda30f5b0cfd0cf15512be9dcd559239dbfc91 -BASE_IMAGE="irnas/vanilla-zephyr-ci-$ZEPHYR_VERSION:latest" +BASE_IMAGE="irnas/vanilla-zephyr-$ZEPHYR_VERSION-ci:latest" docker build \ --build-arg "ZEPHYR_VERSION=$ZEPHYR_VERSION" \ --build-arg "MCUBOOT_VERSION=$MCUBOOT_VERSION" \ --build-arg "BASE_IMAGE=$BASE_IMAGE" \ -f "Dockerfile.dev" \ - -t "irnas/vanilla-zephyr-dev-$ZEPHYR_VERSION:latest" . + -t "irnas/vanilla-zephyr-$ZEPHYR_VERSION-dev:latest" . diff --git a/vanilla-zephyr/run.sh b/vanilla-zephyr/run.sh index 9e2df7b..cb44655 100755 --- a/vanilla-zephyr/run.sh +++ b/vanilla-zephyr/run.sh @@ -24,4 +24,4 @@ docker run -it \ --volume "${1}":/home/user/workdir \ --volume /dev:/dev \ --device-cgroup-rule='c 166:* rmw' \ - irnas/vanilla-zephyr-dev-v3.6.0:latest + irnas/vanilla-zephyr-v3.6.0-dev:latest