x/ranger
Code Issues Proposed changes

Makefile Fixes

Browse Source 
error in tagging, attempting to fix

Change-Id: Idd2539f14c80910ee8f3064e16543ae98c29f3a5
This commit is contained in:
jh629g
2019-11-21 15:27:08 -06:00
parent 3935b6e42a
commit 03335fb4f6
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -30,9 +30,8 @@ IMAGE_DIR:=images/$(IMAGE_NAME)
.PHONY: images .PHONY: images
images: $(IMAGE_NAME) images: $(IMAGE_NAME)
$(IMAGE_NAME): $(IMAGE_NAME):
@echo "===== =====" @echo " "
@echo "===== Processing [$@] image =====" @echo "===== Processing [$@] image ====="
@echo "===== ====="
@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=$@
# Create tgz of the chart # Create tgz of the chart

1
tools/zuul/playbooks/docker-image-build.yaml
View File

@@ -75,7 +75,6 @@
params: params:
BRANCH: "{{ zuul.branch | default('') }}" BRANCH: "{{ zuul.branch | default('') }}"
CHANGE: "{{ zuul.change | default('') }}" CHANGE: "{{ zuul.change | default('') }}"
COMMIT: "{{ zuul.newrev | default('') }}"
PATCHSET: "{{ zuul.patchset | default('') }}" PATCHSET: "{{ zuul.patchset | default('') }}"
LABEL: "org.label-schema.vcs-ref={{ zuul.patchset | default('') }} --label org.label-schema.vcs-url={{ zuul.change | default('') }} --label org.label-schema.version=0.1.0 --label org.label-schema.branch={{ zuul.branch | default('') }}" LABEL: "org.label-schema.vcs-ref={{ zuul.patchset | default('') }} --label org.label-schema.vcs-url={{ zuul.change | default('') }} --label org.label-schema.version=0.1.0 --label org.label-schema.branch={{ zuul.branch | default('') }}"
DOCKER_REGISTRY: "quay.io" DOCKER_REGISTRY: "quay.io"