diff --git a/Makefile b/Makefile index ea03c3c..e2aed6a 100644 --- a/Makefile +++ b/Makefile @@ -65,12 +65,12 @@ build-all: build-base-image build-node-24-image build-node-24-python-3-10-image build-regression-tests-image build-syft: - docker build -f src/base/.devcontainer/Dockerfile.syft --tag local_syft src/base/.devcontainer/ + docker build -f src/base/.devcontainer/Dockerfile.syft --tag local_syft:latest src/base/.devcontainer/ build-grype: - docker build -f src/base/.devcontainer/Dockerfile.grype --tag local_grype src/base/.devcontainer/ + docker build -f src/base/.devcontainer/Dockerfile.grype --tag local_grype:latest src/base/.devcontainer/ build-grant: - docker build -f src/base/.devcontainer/Dockerfile.grant --tag local_grant src/base/.devcontainer/ + docker build -f src/base/.devcontainer/Dockerfile.grant --tag local_grant:latest src/base/.devcontainer/ build-image: build-syft build-grype build-grant guard-CONTAINER_NAME guard-BASE_VERSION_TAG guard-BASE_FOLDER guard-IMAGE_TAG workspace_folder="$${CONTAINER_NAME}"; \ diff --git a/src/base/.devcontainer/Dockerfile b/src/base/.devcontainer/Dockerfile index 65931f1..fe46e44 100644 --- a/src/base/.devcontainer/Dockerfile +++ b/src/base/.devcontainer/Dockerfile @@ -1,6 +1,6 @@ -FROM local_syft AS syft-build -FROM local_grype AS grype-build -FROM local_grant AS grant-build +FROM local_syft:latest AS syft-build +FROM local_grype:latest AS grype-build +FROM local_grant:latest AS grant-build FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04 ARG SCRIPTS_DIR=/usr/local/share/eps