From bf8b33b37254867d2f3bf8aa5f8913e92497e4e1 Mon Sep 17 00:00:00 2001 From: jh629g Date: Wed, 20 Nov 2019 16:18:49 -0600 Subject: [PATCH] Makefile Syntax Fixes Fixing syntax errors in makefile preventing image from being pushed to quay Change-Id: I6e0c11e9e09dfb18e7af221d09620d10d5323a7e --- Makefile | 6 ++---- bindep.txt | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 57699191..01eaaba0 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,6 @@ NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local USE_PROXY ?= false RANGER_USER ?= ranger -IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${COMMIT} IMAGE_DIR:=images/$(IMAGE_NAME) # Build ranger Docker image for this project @@ -36,7 +35,6 @@ images: $(IMAGE_NAME) @echo @echo "===== Processing [$@] image =====" @make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${COMMIT} IMAGE_DIR=images/$@ IMAGE_NAME=$@ - @make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${IMAGE_TAG} IMAGE_DIR=images/$@ IMAGE_NAME=$@ # Create tgz of the chart .PHONY: charts @@ -59,7 +57,7 @@ build_ranger: ifeq ($(USE_PROXY), true) docker build --network host -t $(IMAGE) --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile \ - --build-arg user=$(RANGER_USER) \ + --build-arg user=$(RANGER_USER) \ --build-arg http_proxy=$(PROXY) \ --build-arg https_proxy=$(PROXY) \ --build-arg HTTP_PROXY=$(PROXY) \ @@ -71,7 +69,7 @@ else endif ifeq ($(PUSH_IMAGE), true) - docker push $(IMAGE) + docker push $(IMAGE) endif .PHONY: build_rangercli diff --git a/bindep.txt b/bindep.txt index 58a97489..3388b361 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,2 +1,4 @@ python3-dev [platform:dpkg test] default-libmysqlclient-dev [platform:dpkg test] +libssl-dev [platform:dpkg] +openssl-devel [platform:rpm]