Skip to content

Commit

Permalink
updated docker.mk
Browse files Browse the repository at this point in the history
  • Loading branch information
riya-kaushal7997 committed Feb 3, 2025
1 parent 0bf43a6 commit fe67a5d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2021-2024 Dell Inc., or its subsidiaries. All Rights Reserved.
# Copyright (c) 2021-2025 Dell Inc., or its subsidiaries. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -24,9 +24,10 @@ clean:
build:
GOOS=linux CGO_ENABLED=0 go build -o podmon ./cmd/podmon/

podman:
podman: download-csm-common
$(eval include csm-common.mk)
go run core/semver/semver.go -f mk >semver.mk
make -f docker.mk podman
make -f docker.mk podman DEFAULT_GOIMAGE=$(DEFAULT_GOIMAGE) CSM_BASEIMAGE=$(CSM_BASEIMAGE)

push:
make -f docker.mk push
Expand Down
2 changes: 1 addition & 1 deletion core/core.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2021 - 2022 Dell Inc. or its subsidiaries. All Rights Reserved.
// Copyright © 2021 - 2025 Dell Inc. or its subsidiaries. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
6 changes: 2 additions & 4 deletions docker.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2021-2024 Dell Inc., or its subsidiaries. All Rights Reserved.
# Copyright (c) 2021-2025 Dell Inc., or its subsidiaries. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -20,9 +20,7 @@ endif

REGISTRY?="${REGISTRY_HOST}:${REGISTRY_PORT}/podmon"

podman: download-csm-common
$(eval include csm-common.mk)
@echo "MAJOR $(MAJOR) MINOR $(MINOR) PATCH $(PATCH) RELNOTE $(RELNOTE) SEMVER $(SEMVER)"
podman:
podman build --pull --no-cache -t "$(REGISTRY):$(VERSION)" --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) --build-arg BASEIMAGE=$(CSM_BASEIMAGE) -f ./Dockerfile --label commit=$(shell git log --max-count 1 --format="%H") .

push:
Expand Down

0 comments on commit fe67a5d

Please sign in to comment.