extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-02 08:06:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated Go lang to 1.17.1 version

Browse Source
This commit is contained in:
Alexey Pustovalov 2021-09-14 00:31:35 +02:00
parent 5c1977ea86
commit 78c1ccacec
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/build_images.yml vendored
View File

@ -57,7 +57,8 @@ jobs:
DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x" DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x"
if [ "${{ matrix.os }}" == "ubuntu" ]; then if [ "${{ matrix.os }}" == "ubuntu" ]; then
DOCKER_PLATFORM="linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le" DOCKER_PLATFORM="linux/amd64,linux/arm/v7,linux/arm64"
#,linux/ppc64le"
fi fi
if [ "${{ matrix.os }}" == "ol" ]; then if [ "${{ matrix.os }}" == "ol" ]; then
@ -204,7 +205,8 @@ jobs:
DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x" DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x"
if [ "${{ matrix.os }}" == "ubuntu" ]; then if [ "${{ matrix.os }}" == "ubuntu" ]; then
DOCKER_PLATFORM="linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le" DOCKER_PLATFORM="linux/amd64,linux/arm/v7,linux/arm64"
#,linux/ppc64le"
fi fi
if [ "${{ matrix.os }}" == "ol" ]; then if [ "${{ matrix.os }}" == "ol" ]; then
@ -364,7 +366,8 @@ jobs:
DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x" DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x"
if [ "${{ matrix.os }}" == "ubuntu" ]; then if [ "${{ matrix.os }}" == "ubuntu" ]; then
DOCKER_PLATFORM="linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le" DOCKER_PLATFORM="linux/amd64,linux/arm/v7,linux/arm64"
#,linux/ppc64le"
fi fi
if [ "${{ matrix.os }}" == "ol" ]; then if [ "${{ matrix.os }}" == "ol" ]; then

3
build-base/ubuntu/Dockerfile
View File

@ -46,8 +46,9 @@ RUN set -eux && \
git \ git \
tar \ tar \
wget \ wget \
gnupg \
unixodbc-dev && \ unixodbc-dev && \
ARCH_SUFFIX="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ ARCH_SUFFIX="$(dpkg --print-architecture)"; ARCH_SUFFIX="${ARCH_SUFFIX##*-}"; \
case "$ARCH_SUFFIX" in \ case "$ARCH_SUFFIX" in \
'amd64') \ 'amd64') \
url='https://dl.google.com/go/go1.17.1.linux-amd64.tar.gz'; \ url='https://dl.google.com/go/go1.17.1.linux-amd64.tar.gz'; \