Skip to content

Commit

Permalink
make: update some make targets to use ${CONTAINER_ENGINE}
Browse files Browse the repository at this point in the history
The "${CONTAINER_ENGINE}" variable should be used instead of "docker"
within make targets. This commits fixes 2 instances where "docker" was
used instead of the variable.

Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>
  • Loading branch information
rolinh authored and qmonnet committed Apr 30, 2020
1 parent 6d52ae4 commit ec201d8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -254,7 +254,7 @@ docker-operator-image: GIT_VERSION
$(QUIET)$(CONTAINER_ENGINE) build --build-arg LOCKDEBUG=${LOCKDEBUG} -f cilium-operator.Dockerfile -t "cilium/operator:$(DOCKER_IMAGE_TAG)" .
$(QUIET)$(CONTAINER_ENGINE) tag cilium/operator:$(DOCKER_IMAGE_TAG) cilium/operator:$(DOCKER_IMAGE_TAG)-${GOARCH}
$(QUIET)echo "Push like this when ready:"
$(QUIET)echo "docker push cilium/operator:$(DOCKER_IMAGE_TAG)-${GOARCH}"
$(QUIET)echo "${CONTAINER_ENGINE} push cilium/operator:$(DOCKER_IMAGE_TAG)-${GOARCH}"

docker-operator-manifest:
@$(ECHO_CHECK) contrib/scripts/push_manifest.sh operator $(DOCKER_IMAGE_TAG)
Expand All @@ -264,7 +264,7 @@ docker-plugin-image: GIT_VERSION
$(QUIET)$(CONTAINER_ENGINE) build --build-arg LOCKDEBUG=${LOCKDEUBG} -f cilium-docker-plugin.Dockerfile -t "cilium/docker-plugin:$(DOCKER_IMAGE_TAG)" .
$(QUIET)$(CONTAINER_ENGINE) tag cilium/docker-plugin:$(DOCKER_IMAGE_TAG) cilium/docker-plugin:$(DOCKER_IMAGE_TAG)-${GOARCH}
$(QUIET)echo "Push like this when ready:"
$(QUIET)echo "docker push cilium/docker-plugin:$(DOCKER_IMAGE_TAG)-${GOARCH}"
$(QUIET)echo "${CONTAINER_ENGINE} push cilium/docker-plugin:$(DOCKER_IMAGE_TAG)-${GOARCH}"

docker-plugin-manifest:
@$(ECHO_CHECK) contrib/scripts/push_manifest.sh docker-plugin $(DOCKER_IMAGE_TAG)
Expand Down

0 comments on commit ec201d8

Please sign in to comment.