Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update makefile for pipeline #30

Merged
merged 1 commit into from
Sep 23, 2021
Merged

update makefile for pipeline #30

merged 1 commit into from
Sep 23, 2021

Conversation

Muzry
Copy link
Contributor

@Muzry Muzry commented Sep 23, 2021

What type of this PR

Add one of the following kinds:
/kind bug

What this PR does / why we need it:

  • update makefile for pipeline

Which issue(s) this PR fixes:

  • Fixes #your-issue_number
  • [Erda Cloud Issue Link](paste your link here)

Specified Reviewers:

/assign @luobily

Need cherry-pick to release versions?

Add comment like /cherry-pick release/1.0 when this PR is merged.

For details on the cherry pick process, see the cherry pick requests section under CONTRIBUTING.md.

@Muzry Muzry merged commit ea72df2 into erda-project:release/1.3 Sep 23, 2021
@Muzry
Copy link
Contributor Author

Muzry commented Sep 23, 2021

/cherry-pick master

@erda-bot
Copy link
Member

Automated cherry pick failed, please resolve the confilcts and create PR manually.
Details:

Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
diff --cc Makefile
index b1df558,1b1a9dc..0000000
--- a/Makefile
+++ b/Makefile
@@@ -35,8 -41,10 +35,13 @@@ container
  	  image=$(IMAGE_PREFIX)$${target}$(IMAGE_SUFFIX);                                  \
  	  docker build -t $(REGISTRY)/$${image}:$(IMAGE_TAG)                               \
  	    --build-arg GO_PROJECT_ROOT=$(GO_PROJECT_ROOT)                                 \
++<<<<<<< HEAD
++=======
+ 	    --build-arg GO_PROXY=$(GO_PROXY)						   \
++>>>>>>> ea72df2 (update makefile for pipeline (#30))
  	    --label $(DOCKER_LABELS)                                                       \
  	    -f $(BUILD_DIR)/$${target}/Dockerfile .;                                       \
+ 	  echo "image=$(REGISTRY)/$${image}:$(IMAGE_TAG)" >> $${METAFILE};		   \
  	done
  
  push: container

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants