x/ranger
Code Issues Proposed changes

Makefile Syntax Fixes

Browse Source 
Fixing syntax errors in makefile
preventing image from being pushed
to quay

Change-Id: I6e0c11e9e09dfb18e7af221d09620d10d5323a7e
This commit is contained in:
jh629g 2019-11-20 16:18:49 -06:00
parent 8bae20adff
commit bf8b33b372
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -25,7 +25,6 @@ NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
USE_PROXY ?= false USE_PROXY ?= false
RANGER_USER ?= ranger RANGER_USER ?= ranger
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${COMMIT}
IMAGE_DIR:=images/$(IMAGE_NAME) IMAGE_DIR:=images/$(IMAGE_NAME)
# Build ranger Docker image for this project # Build ranger Docker image for this project
@ -36,7 +35,6 @@ images: $(IMAGE_NAME)
@echo @echo
@echo "===== Processing [$@] image =====" @echo "===== Processing [$@] image ====="
@make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${COMMIT} IMAGE_DIR=images/$@ IMAGE_NAME=$@ @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 # Create tgz of the chart
.PHONY: charts .PHONY: charts
@ -59,7 +57,7 @@ build_ranger:
ifeq ($(USE_PROXY), true) ifeq ($(USE_PROXY), true)
docker build --network host -t $(IMAGE) --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile \ 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 http_proxy=$(PROXY) \
--build-arg https_proxy=$(PROXY) \ --build-arg https_proxy=$(PROXY) \
--build-arg HTTP_PROXY=$(PROXY) \ --build-arg HTTP_PROXY=$(PROXY) \
@ -71,7 +69,7 @@ else
endif endif
ifeq ($(PUSH_IMAGE), true) ifeq ($(PUSH_IMAGE), true)
docker push $(IMAGE) docker push $(IMAGE)
endif endif
.PHONY: build_rangercli .PHONY: build_rangercli

2
bindep.txt
View File

@ -1,2 +1,4 @@
python3-dev [platform:dpkg test] python3-dev [platform:dpkg test]
default-libmysqlclient-dev [platform:dpkg test] default-libmysqlclient-dev [platform:dpkg test]
libssl-dev [platform:dpkg]
openssl-devel [platform:rpm]