Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Commit 1feeebf

Browse files
Merge pull request #149 from jetstack/munnerz-patch-1
Automatic merge from submit-queue. Remove references to minikube in Makefile **What this PR does / why we need it**: Since #144 has merged, we no longer reference minikube within navigator. Our builds on travis are now failing, as Travis does not have (nor need) minikube. This PR fixes up the Makefile to reflect these latest changes. **Release note**: ```release-note NONE ```
2 parents fe345ba + 219e7db commit 1feeebf

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
- docker
1111

1212
script:
13-
- make docker_build
13+
- make build docker_build
1414
- if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ]; then
1515
mkdir -p ~/.docker && echo "${DOCKER_AUTH_CONFIG}" > ~/.docker/config.json && chmod 600 ~/.docker/config.json;
1616
make docker_push IMAGE_TAGS="${TRAVIS_COMMIT} latest";

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ verify: .hack_verify go_verify
6161
DOCKER_BUILD_TARGETS = $(addprefix docker_build_, $(CMDS))
6262
$(DOCKER_BUILD_TARGETS):
6363
$(eval DOCKER_BUILD_CMD := $(subst docker_build_,,$@))
64-
eval $$(minikube docker-env --profile $$HOSTNAME --shell sh); \
6564
docker build -t $(REGISTRY)/$(IMAGE_NAME)-$(DOCKER_BUILD_CMD):$(BUILD_TAG) -f Dockerfile.$(DOCKER_BUILD_CMD) .
6665
docker_build: $(DOCKER_BUILD_TARGETS)
6766

@@ -70,7 +69,6 @@ $(DOCKER_PUSH_TARGETS):
7069
$(eval DOCKER_PUSH_CMD := $(subst docker_push_,,$@))
7170
set -e; \
7271
for tag in $(IMAGE_TAGS); do \
73-
eval $$(minikube docker-env --profile $$HOSTNAME --shell sh); \
7472
docker tag $(REGISTRY)/$(IMAGE_NAME)-$(DOCKER_PUSH_CMD):$(BUILD_TAG) $(REGISTRY)/$(IMAGE_NAME)-$(DOCKER_PUSH_CMD):$${tag} ; \
7573
docker push $(REGISTRY)/$(IMAGE_NAME)-$(DOCKER_PUSH_CMD):$${tag}; \
7674
done

0 commit comments

Comments
 (0)