From a3e833df54337fe6aea06f3c84d57c808311813a Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Sun, 1 Jun 2025 23:11:05 +0200 Subject: [PATCH] feat: remove build-ubuntu Makefile target This results in the build-ubuntu alias image not being targeted for scanning publishing and archiving. --- Makefile | 13 ++++--------- TARGET | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index b24eb87..9893430 100644 --- a/Makefile +++ b/Makefile @@ -60,11 +60,13 @@ BUILD_TRIVY_TARGETS := $(addprefix build-trivy, 063) PROXY_SQUIDCACHE_TARGETS := $(addprefix proxy-squidcache, 613) ATLASSIAN_BITBUCKETRUNNER_TARGETS := $(addprefix atlassian-bitbucketrunner, 323) +_none: + echo "Doing nothing." _clean: rm -rvf configure~ autom4te.cache/ config.log config.status _all-ubuntu: _all-build-ubuntu _all-windowsserver: _all-build-windowsserver _all-atlassian-windowsserver -_all-build-ubuntu: build-ubuntu2504 build-ubuntu _all-build-python-ubuntu _all-build-node-ubuntu _all-build-trivy-ubuntu +_all-build-ubuntu: build-ubuntu2504 _all-build-python-ubuntu _all-build-node-ubuntu _all-build-trivy-ubuntu _all-build-windowsserver: _all-build-openjdk-windowsserver _all-atlassian-windowsserver: _all-atlassian-bitbucketrunner-windowsserver _all-proxy-ubuntu: _all-atlassian-bitbucketrunner-windowsserver @@ -74,17 +76,10 @@ _all-build-openjdk-windowsserver: $(addsuffix -windowsserver, $(BUILD_OPENJDK_TA _all-build-trivy-ubuntu: $(addsuffix -ubuntu, $(BUILD_TRIVY_TARGETS)) _all-atlassian-bitbucketrunner-windowsserver: $(addsuffix -windowsserver, $(ATLASSIAN_BITBUCKETRUNNER_TARGETS)) - -build-ubuntu: build-ubuntu2504 -$(addsuffix -ubuntu, $(BUILD_NODE_TARGETS)) \ -$(addsuffix -ubuntu, $(BUILD_PYTHON_TARGETS)) \ -$(addsuffix -ubuntu, $(BUILD_TRIVY_TARGETS)) \ -$(addsuffix -ubuntu, $(PROXY_SQUIDCACHE_TARGETS)): build-ubuntu - $(addsuffix -windowsserver, $(ATLASSIAN_BITBUCKETRUNNER_TARGETS)): build-openjdk21-windowsserver -build-ubuntu build-ubuntu2504 \ +build-ubuntu2504 \ build-windowsserver build-windowsserver2022 \ $(addsuffix -windowsserver, $(BUILD_OPENJDK_TARGETS)) \ $(addsuffix -ubuntu, $(BUILD_NODE_TARGETS)) \ diff --git a/TARGET b/TARGET index 1e451e0..9082d55 100644 --- a/TARGET +++ b/TARGET @@ -1 +1 @@ -_all-ubuntu +_none