Skip to content
This repository was archived by the owner on Nov 2, 2020. It is now read-only.

Commit 2978418

Browse files
committed
Merge
1 parent 82528fb commit 2978418

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Build Status](https://travis-ci.com/pschmitt/zabbix-docker-multiarch.svg?branch=master)](https://travis-ci.com/pschmitt/zabbix-docker-multiarch)
44

5-
![GitHub Actions CI](https://github.com/pschmitt/zabbix-docker-multiarch/workflows/GitHub%20Actions%20CI/badge.svg)
5+
[![GitHub Actions CI](https://github.com/pschmitt/zabbix-docker-multiarch/workflows/GitHub%20Actions%20CI/badge.svg)](https://github.com/pschmitt/zabbix-docker-multiarch/actions?query=workflow%3A%22GitHub+Actions+CI%22)
66

77
You can find the resulting images in the [zabbixmultiarch Docker Hub organization](https://hub.docker.com/u/zabbixmultiarch).
88

@@ -33,9 +33,9 @@ docker run --name some-zabbix-agent -e ZBX_HOSTNAME="some-hostname" -e ZBX_SERVE
3333

3434
## CI
3535

36-
All upstream projects are built using both [Travis CI](https://travis-ci.com/pschmitt/zabbix-docker-multiarch) and [GitHub Actions](https://github.com/pschmitt/zabbix-docker-multiarch/actions?query=workflow%3A%22GitHub+Actions+CI%22)
37-
**except** zabbix-agent2 since [it won't build properly with buildx and QEMU for ARM](https://github.com/pschmitt/zabbix-docker-multiarch/issues/3).
36+
All upstream projects are built using [GitHub Actions](https://github.com/pschmitt/zabbix-docker-multiarch/actions?query=workflow%3A%22GitHub+Actions+CI%22)
37+
**except** zabbix-agent2 since it won't build properly with buildx and QEMU for ARM.
3838

3939
I currently build zabbix-agent2 locally every day using an AMD64 machine and a Raspberry Pi.
4040

41-
Sadly due to https://github.com/docker/buildx/issues/177 only the `latest` tag get published for the moment.
41+
Sadly due to [a bug in buildx](https://github.com/docker/buildx/issues/177) only the `latest` tag get published for the moment.

build.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ get_available_architectures_safe() {
5353

5454
all_archs=$(get_available_architectures "$@")
5555
if [[ "$OS" == "centos" ]]
56-
then
57-
# grep -vE 'ppc64le|s390x|arm/v6|arm/v7' <<< "$all_archs"
58-
grep -vE 'arm/v6|arm/v7' <<< "$all_archs"
59-
elif [[ "$PROJECT" == "agent2" ]]
6056
then
6157
# grep -vE 'ppc64le|s390x|arm/v6|arm/v7' <<< "$all_archs"
6258
grep -vE 'arm/v6|arm/v7' <<< "$all_archs"

0 commit comments

Comments
 (0)