diff options
author | vitt-bagal <31851690+vitt-bagal@users.noreply.github.com> | 2020-01-27 15:25:35 +0530 |
---|---|---|
committer | Ben Kochie <superq@gmail.com> | 2020-01-27 10:55:35 +0100 |
commit | 04ad4b351058bc89e83702d149f2961efa989bf4 (patch) | |
tree | ef38277e8292fd96920279beab4e8012acceb0f1 | |
parent | e7a27366a05126338870768a601a40ef7fdd742a (diff) | |
download | prometheus_node_collector-04ad4b351058bc89e83702d149f2961efa989bf4.tar.bz2 prometheus_node_collector-04ad4b351058bc89e83702d149f2961efa989bf4.tar.xz prometheus_node_collector-04ad4b351058bc89e83702d149f2961efa989bf4.zip |
Added s390x support for docker image (#1539)
Signed-off-by: Vitthal Bagal <vitthalb@us.ibm.com>
-rw-r--r-- | .circleci/config.yml | 2 | ||||
-rw-r--r-- | .dockerignore | 1 | ||||
-rw-r--r-- | Makefile | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 57cdc2e..a59103a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml | |||
@@ -40,7 +40,7 @@ jobs: | |||
40 | 40 | ||
41 | steps: | 41 | steps: |
42 | - checkout | 42 | - checkout |
43 | - run: docker run --privileged linuxkit/binfmt:v0.6 | 43 | - run: docker run --privileged linuxkit/binfmt:v0.7 |
44 | - run: make promu | 44 | - run: make promu |
45 | - run: promu crossbuild | 45 | - run: promu crossbuild |
46 | - run: promu --config .promu-cgo.yml crossbuild | 46 | - run: promu --config .promu-cgo.yml crossbuild |
diff --git a/.dockerignore b/.dockerignore index 7aff1fd..cfeaf5f 100644 --- a/.dockerignore +++ b/.dockerignore | |||
@@ -5,3 +5,4 @@ | |||
5 | !.build/linux-armv7 | 5 | !.build/linux-armv7 |
6 | !.build/linux-arm64 | 6 | !.build/linux-arm64 |
7 | !.build/linux-ppc64le | 7 | !.build/linux-ppc64le |
8 | !.build/linux-s390x | ||
@@ -15,7 +15,7 @@ | |||
15 | all:: | 15 | all:: |
16 | 16 | ||
17 | # Needs to be defined before including Makefile.common to auto-generate targets | 17 | # Needs to be defined before including Makefile.common to auto-generate targets |
18 | DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le | 18 | DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le s390x |
19 | 19 | ||
20 | include Makefile.common | 20 | include Makefile.common |
21 | 21 | ||