Skip to content

Commit

Permalink
Make the IMAGE_NAME settable from env (stolostron#5)
Browse files Browse the repository at this point in the history
  • Loading branch information
Dominique Vernier authored and ibm-ci-bot committed Oct 15, 2019
1 parent 8dd2d8b commit 62d844a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Configfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ DOCKER_REGISTRY ?= hyc-cloud-private-integration-docker-local.artifactory.swg-de
DOCKER_NAMESPACE ?= ibmcom
DOCKER_TAG ?= latest
# Variables for Red Hat required labels
IMAGE_NAME = multicloud-operators-subscription-release
IMAGE_NAME ?= multicloud-operators-subscription-release
IMAGE_DESCRIPTION = This_image_contains_the_multicloud_operators_subscription_release_for_processing_new_CRs_based_on_the_CRD
IMAGE_MAINTAINER = [email protected]
IMAGE_VENDOR = IBM
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ local:
operator-sdk up local --verbose

ossc:
@if [ -z $(dest) ]; then \
echo "Usage: make dest=destination_dir wicked"; \
exit 1; \
fi
rm -rf /tmp/awsom-tool; mkdir -p /tmp/awsom-tool; cd /tmp; git clone https://github.ibm.com/IBMPrivateCloud/awsom-tool --depth 1; cd awsom-tool; make local; cd $(CURDIR)
# @if [ -z $(dest) ]; then \
# echo "Usage: make dest=destination_dir wicked"; \
# exit 1; \
# fi
# rm -rf /tmp/awsom-tool; mkdir -p /tmp/awsom-tool; cd /tmp; git clone https://github.ibm.com/IBMPrivateCloud/awsom-tool --depth 1; cd awsom-tool; make local; cd $(CURDIR)
rm -rf $(dest)/$(PROJECT_NAME)_scan-results && \
mkdir -p $(dest)/$(PROJECT_NAME)_scan-results && \
/tmp/awsom-tool/_build/awsomtool golang scan -o $(dest)/$(PROJECT_NAME)_scan-results/Scan-Report.csv && \
Expand Down

0 comments on commit 62d844a

Please sign in to comment.