testing make logic

senzing-factory · Feb 24, 2020 · c8287dc · c8287dc
1 parent 48bc668
commit c8287dc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/push-build.yml b/.github/workflows/push-build.yml
@@ -16,4 +16,8 @@ jobs:
         run: git checkout origin/${GITHUB_HEAD_REF:-${GITHUB_REF##*/}}
       - name: Build Docker Image
         id: build_docker_image
-        run: make docker-build
+        run: |
+          make \
+            GITHUB_HEAD_REF=${GITHUB_HEAD_REF:-${GITHUB_REF##*/}} \
+            GITHUB_EVENT_NAME=${GITHUB_EVENT_NAME} \
+            docker-build
diff --git a/Makefile b/Makefile
@@ -41,13 +41,17 @@ default: help
 .PHONY: docker-build
 docker-build: docker-rmi-for-build
 	docker build \
+		--build-arg GITHUB_HEAD_REF=$(GITHUB_HEAD_REF) \
+		--build-arg GITHUB_EVENT_NAME=$(GITHUB_EVENT_NAME) \
 	    --tag $(GIT_REPOSITORY_NAME) \
 		--tag $(GIT_REPOSITORY_NAME):$(GIT_VERSION) \
 		build/docker
 
 .PHONY: docker-build-development-cache
 docker-build-development-cache: docker-rmi-for-build-development-cache
 	docker build \
+		--build-arg GITHUB_HEAD_REF=$(GITHUB_HEAD_REF) \
+		--build-arg GITHUB_EVENT_NAME=$(GITHUB_EVENT_NAME) \
 		--tag $(GIT_REPOSITORY_NAME):$(GIT_VERSION) \
 		build/docker
 

diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
@@ -22,8 +22,7 @@ WORKDIR /go/src/git-action-jira-issue-creation
 
 # Check merge if build is triggered by a pull request
 WORKDIR /go/src/git-action-jira-issue-creation
-RUN if [[ "${GITHUB_HEAD_REF}" != "master" && ${GITHUB_EVENT_NAME} == "pull_request" ]]; \
-    then \
+RUN if [[ "${GITHUB_HEAD_REF}" != "master" && "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then \
         git checkout ${GITHUB_HEAD_REF}; \
         git merge master; \
     fi