Skip to content

Commit 6a48356

Browse files
committed
fix tag
1 parent c2726ad commit 6a48356

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ build-image: guard-CONTAINER_NAME guard-BASE_VERSION_TAG guard-BASE_FOLDER guard
2626
--workspace-folder ./src/$${BASE_FOLDER}/$${CONTAINER_NAME} \
2727
--push false \
2828
--cache-from "${CONTAINER_PREFIX}$${CONTAINER_NAME}:latest" \
29-
--image-name "${CONTAINER_PREFIX}$${CONTAINER_NAME}:${IMAGE_TAG}"
29+
--image-name "${CONTAINER_PREFIX}$${CONTAINER_NAME}:$${IMAGE_TAG}"
3030

3131
scan-image: guard-CONTAINER_NAME guard-BASE_FOLDER
3232
@combined="src/$${BASE_FOLDER}/$${CONTAINER_NAME}/.trivyignore_combined.yaml"; \
@@ -40,7 +40,7 @@ scan-image: guard-CONTAINER_NAME guard-BASE_FOLDER
4040
--config src/${BASE_FOLDER}/${CONTAINER_NAME}/trivy.yaml \
4141
--scanners vuln \
4242
--exit-code 1 \
43-
--format table "${CONTAINER_PREFIX}$${CONTAINER_NAME}"
43+
--format table "${CONTAINER_PREFIX}$${CONTAINER_NAME}:$${IMAGE_TAG}"
4444

4545
scan-image-json: guard-CONTAINER_NAME guard-BASE_FOLDER
4646
@combined="src/$${BASE_FOLDER}/$${CONTAINER_NAME}/.trivyignore_combined.yaml"; \
@@ -56,11 +56,11 @@ scan-image-json: guard-CONTAINER_NAME guard-BASE_FOLDER
5656
--scanners vuln \
5757
--exit-code 1 \
5858
--format json \
59-
--output .out/scan_results_docker.json "${CONTAINER_PREFIX}$${CONTAINER_NAME}"
59+
--output .out/scan_results_docker.json "${CONTAINER_PREFIX}$${CONTAINER_NAME}:$${IMAGE_TAG}"
6060

6161
shell-image: guard-CONTAINER_NAME
6262
docker run -it \
63-
"${CONTAINER_PREFIX}$${CONTAINER_NAME}${IMAGE_TAG}" \
63+
"${CONTAINER_PREFIX}$${CONTAINER_NAME}:$${IMAGE_TAG}" \
6464
bash
6565

6666
lint: lint-githubactions

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,17 @@ CONTAINER_NAME=base \
9494
Language images
9595
```
9696
CONTAINER_NAME=node_24_python_3_12 \
97-
BASE_VERSION_TAG=latest \
97+
BASE_VERSION_TAG=local-build \
9898
BASE_FOLDER=languages \
99+
IMAGE_TAG=local-build \
99100
make build-image
100101
```
101102
Project images
102103
```
103104
CONTAINER_NAME=fhir_facade_api \
104-
BASE_VERSION_TAG=latest \
105+
BASE_VERSION_TAG=local-build \
105106
BASE_FOLDER=projects \
107+
IMAGE_TAG=local-build \
106108
make build-image
107109
```
108110

0 commit comments

Comments
 (0)