From 78c1ccacec0c413af6cc83456611cbaba2d05330 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 14 Sep 2021 00:31:35 +0200 Subject: [PATCH] Updated Go lang to 1.17.1 version --- .github/workflows/build_images.yml | 9 ++++++--- build-base/ubuntu/Dockerfile | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_images.yml b/.github/workflows/build_images.yml index 664587ac0..ebf0e0b5e 100644 --- a/.github/workflows/build_images.yml +++ b/.github/workflows/build_images.yml @@ -57,7 +57,8 @@ jobs: DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x" 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 if [ "${{ matrix.os }}" == "ol" ]; then @@ -204,7 +205,8 @@ jobs: DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x" 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 if [ "${{ matrix.os }}" == "ol" ]; then @@ -364,7 +366,8 @@ jobs: DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x" 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 if [ "${{ matrix.os }}" == "ol" ]; then diff --git a/build-base/ubuntu/Dockerfile b/build-base/ubuntu/Dockerfile index c7b52dd0f..12146c1da 100644 --- a/build-base/ubuntu/Dockerfile +++ b/build-base/ubuntu/Dockerfile @@ -46,8 +46,9 @@ RUN set -eux && \ git \ tar \ wget \ + gnupg \ unixodbc-dev && \ - ARCH_SUFFIX="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + ARCH_SUFFIX="$(dpkg --print-architecture)"; ARCH_SUFFIX="${ARCH_SUFFIX##*-}"; \ case "$ARCH_SUFFIX" in \ 'amd64') \ url='https://dl.google.com/go/go1.17.1.linux-amd64.tar.gz'; \