From 43f519778e0e844f70395c7d7cdebdb1f99d79eb Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 14 Sep 2021 02:17:14 +0200 Subject: [PATCH] Updated Go lang to 1.17.1 version --- .github/workflows/build_images.yml | 28 ++++++++++++++++------------ build-base/alpine/Dockerfile | 1 + 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_images.yml b/.github/workflows/build_images.yml index ebf0e0b5e..277e4f1d6 100644 --- a/.github/workflows/build_images.yml +++ b/.github/workflows/build_images.yml @@ -19,6 +19,17 @@ defaults: shell: bash jobs: + init_build: + name: Initialize build + runs-on: ubuntu-latest + outputs: + os: ["alpine", "ol", "ubuntu"] + steps: + - name: Checkout the repository + uses: actions/checkout@v2 + with: + fetch-depth: 1 + build_base: timeout-minutes: 70 name: Build ${{ matrix.build }} base on ${{ matrix.os }} @@ -30,14 +41,13 @@ jobs: matrix: build: - build-base - os: - - alpine - - ubuntu - - ol + os: ${{ fromJson(needs.init_build.outputs.os) }} runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 + with: + fetch-depth: 1 - name: Set up QEMU uses: docker/setup-qemu-action@v1 @@ -178,10 +188,7 @@ jobs: - build-mysql - build-pgsql - build-sqlite3 - os: - - alpine - - ubuntu - - ol + os: ${{ fromJson(needs.init_build.outputs.os) }} runs-on: ubuntu-20.04 steps: @@ -339,10 +346,7 @@ jobs: - agent2 - proxy-mysql - java-gateway - os: - - alpine - - ubuntu - - ol + os: ${{ fromJson(needs.init_build.outputs.os) }} runs-on: ubuntu-20.04 steps: diff --git a/build-base/alpine/Dockerfile b/build-base/alpine/Dockerfile index c8645f34e..20f6424aa 100644 --- a/build-base/alpine/Dockerfile +++ b/build-base/alpine/Dockerfile @@ -20,6 +20,7 @@ LABEL org.opencontainers.image.title="Zabbix build base" \ org.opencontainers.image.source="${ZBX_SOURCES}" RUN set -eux && \ + env && \ apk add --no-cache --clean-protected \ bash \ autoconf \