File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff 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
3131scan-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
4545scan-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
6161shell-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
6666lint : lint-githubactions
Original file line number Diff line number Diff line change @@ -94,15 +94,17 @@ CONTAINER_NAME=base \
9494Language images
9595```
9696CONTAINER_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```
101102Project images
102103```
103104CONTAINER_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
You can’t perform that action at this time.
0 commit comments