Skip to content

Commit 0f56822

Browse files
authored
Fix Docker build & push targets (#1714)
Signed-off-by: Andy Bavier <andybavier@gmail.com>
1 parent b406844 commit 0f56822

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ export GO111MODULE=on
1010
.PHONY: build
1111

1212
ONOS_CONFIG_VERSION ?= latest
13+
DOCKER_TAG ?= ${ONOS_CONFIG_VERSION}
14+
DOCKER_REPOSITORY ?= onosproject/
15+
DOCKER_REGISTRY ?= ""
16+
DOCKER_IMAGENAME := ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}onos-config:${DOCKER_TAG}
1317

1418
GOLANG_CI_VERSION := v1.52.2
1519

@@ -33,13 +37,13 @@ test: build lint license
3337
docker-build-onos-config: # @HELP build onos-config base Docker image
3438
docker-build-onos-config: local-deps
3539
docker build --platform linux/amd64 . -f build/onos-config/Dockerfile \
36-
-t onosproject/onos-config:${ONOS_CONFIG_VERSION}
40+
-t ${DOCKER_IMAGENAME}
3741

3842
docker-build: # @HELP build all Docker images
3943
docker-build: build docker-build-onos-config
4044

4145
docker-push-onos-config: # @HELP push onos-pci Docker image
42-
docker push onosproject/onos-config:${ONOS_CONFIG_VERSION}
46+
docker push ${DOCKER_IMAGENAME}
4347

4448
docker-push: # @HELP push docker images
4549
docker-push: docker-push-onos-config

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.6-dev
1+
1.1.6

0 commit comments

Comments
 (0)