Add dockerfile for ppc64le and related changes #638
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
grobie
reviewed
Aug 10, 2017
Makefile
Outdated
| @@ -77,8 +78,14 @@ tarball: $(PROMU) | |||
| @$(PROMU) tarball --prefix $(PREFIX) $(BIN_DIR) | |||
|
|
|||
| docker: | |||
| ifeq ($(MACH), ppc64le) | |||
| @echo ">> building docker image for ppc64le" | |||
| $(eval FILE_SUFFIX=.ppc64le) | |||
There was a problem hiding this comment.
I'd call it DOCKER_FILE and pass the full file. Could also happen setting as variable at the top.
There was a problem hiding this comment.
Agreed, pushing a new commit.
grobie
approved these changes
Aug 14, 2017
There was a problem hiding this comment.
Personally I'd keep all variable definitions at the top of the file and avoid eval. I guess it should be possible to set up to do the following:
- if DOCKERFILE is set already, don't do anything
- if DOCKERFILE isn't set use Dockerfile
- if DOCKERFILE isn't set and arch is ppc64le, use Dockerfile.ppc64le.
@matthiasr surely knows what I want ;-) It's not important though, we can change that later.
Makefile
Outdated
| @@ -77,8 +79,11 @@ tarball: $(PROMU) | |||
| @$(PROMU) tarball --prefix $(PREFIX) $(BIN_DIR) | |||
|
|
|||
| docker: | |||
| ifeq ($(MACH), ppc64le) | |||
| $(eval DOCKERFILE=Dockerfile.ppc64le) | |||
| endif | |||
| @echo ">> building docker image" | |||
There was a problem hiding this comment.
Let's include the dockerfile we're using in this message. Something like >> building docker image from $(DOCKERFILE).
There was a problem hiding this comment.
Included the dockerfile in the build message.
oblitorum
pushed a commit
to shatteredsilicon/node_exporter
that referenced
this pull request
Apr 9, 2024
* Add dockerfile for ppc64le and related changes * Pass the fill file as DOCKEFILE * Add the dockerfile name to build msg
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A small change in the makefile determining the right architecture and a new Dockerfile.ppc64le where the base image is different (ppc64le/busybox:glibc).