Skip to content

Commit d6a9781

Browse files
ekoopspoiana
authored andcommitted
chore(images/Makefile): tag images built by arch/distro/kern targets
Signed-off-by: Leonardo Di Giovanna <[email protected]>
1 parent 935565d commit d6a9781

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

images/Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ build-kernel: initrd-builder
126126
arch=$(ARCH); \
127127
rootfs_dir=$$(find . -type d -path "./$$arch/$$distro/$$version"); \
128128
kernel_dir=$$(find . -type d -path "./$$arch/$$distro/$$version"); \
129-
rootfs_image=$(REPOSITORY)/$$distro-image:$$version-$$arch; \
130-
kernel_image=$(REPOSITORY)/$$distro-kernel:$$version-$$arch; \
129+
rootfs_image=$(REPOSITORY)/$$distro-image:$$version-$$arch-$(TAG); \
130+
kernel_image=$(REPOSITORY)/$$distro-kernel:$$version-$$arch-$(TAG); \
131131
if [ -n "$$rootfs_dir" ]; then \
132132
if [ "$(DRY_RUN)" = "true" ]; then \
133133
echo "Dry run: Building rootfs image: docker build -t $$rootfs_image --build-arg CMAKE_VERSION=\"$(CMAKE_VERSION)\" $$rootfs_dir"; \
@@ -148,7 +148,10 @@ build-kernel: initrd-builder
148148
echo "Dry run: Building kernel image: docker build -t $$kernel_image -f $$kernel_dir/Dockerfile.kernel $$kernel_dir"; \
149149
else \
150150
echo "Building kernel image: $$kernel_image"; \
151-
docker build -t $$kernel_image -f $$kernel_dir/Dockerfile.kernel $$kernel_dir; \
151+
docker build \
152+
-t $$kernel_image \
153+
-f $$kernel_dir/Dockerfile.kernel \
154+
$$kernel_dir; \
152155
if [ "$(PUSH)" = "true" ]; then \
153156
echo "Pushing image: $$kernel_image"; \
154157
docker push $$kernel_image; \

0 commit comments

Comments
 (0)