Skip to content

Commit bd9db8e

Browse files
authored
Merge pull request plus3it#1449 from lorengordon/fix/docker-run
2 parents 9d75363 + 75595bc commit bd9db8e

3 files changed

Lines changed: 19 additions & 3 deletions

File tree

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.29.0
2+
current_version = 0.29.1
33
commit = True
44
message = Bumps version to {new_version}
55
tag = False

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
66

7-
### [0.28.7](https://github.com/plus3it/tardigrade-ci/releases/tag/0.29.0)
7+
### [0.29.1](https://github.com/plus3it/tardigrade-ci/releases/tag/0.29.1)
8+
9+
**Released**: 2026.04.01
10+
11+
**Summary**:
12+
13+
* Pulls or builds image if not present in docker local storage
14+
15+
### [0.29.0](https://github.com/plus3it/tardigrade-ci/releases/tag/0.29.0)
816

917
**Released**: 2026.03.30
1018

Makefile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,15 @@ docker/run: export target ?= help
545545
docker/run: export entrypoint ?= entrypoint.sh
546546
docker/run: export DOCKER_USERNS ?=
547547
docker/run: | guard/env/TARDIGRADE_CI_PATH guard/env/TARDIGRADE_CI_PROJECT
548-
@echo "[$@]: Running docker image"
548+
@ echo "[$@]: Checking the image '$(IMAGE_NAME)' exists..."
549+
@ if docker image inspect $(IMAGE_NAME) > /dev/null 2>&1; \
550+
then \
551+
echo "[$@]: Using image found in local storage '$(IMAGE_NAME)' -- To rebuild image, run 'make docker/build'"; \
552+
else \
553+
echo "[$@]: Image '$(IMAGE_NAME)' not found, trying to pull or build..."; \
554+
docker pull $(IMAGE_NAME) > /dev/null 2>&1 || $(SELF) docker/build; \
555+
fi
556+
@ echo "[$@]: Running target "$(target)"..."
549557
userns=""; \
550558
if docker --version 2>/dev/null | grep -qi podman; then userns="--userns=keep-id"; elif [ -n "$(DOCKER_USERNS)" ]; then userns="--userns=$(DOCKER_USERNS)"; fi; \
551559
docker run $(DOCKER_RUN_FLAGS) \

0 commit comments

Comments
 (0)