diff options
| author | Nicolas Hennion <nicolas@nicolargo.com> | 2021-01-02 12:11:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-02 12:11:05 +0100 |
| commit | 77568e0546e08bfe19b7c91b9938c533f89d447d (patch) | |
| tree | 3475efe1dccd9dbd1228d89c475afed43c29086b | |
| parent | 31c13d889aeaae11a5958f7a861ac5a18429ac0d (diff) | |
| parent | 23c927bb2b54cdc870fcfcce2f22b3a82d89badd (diff) | |
Merge pull request #1783 from BlackDark/armv6
Readd armv6 docker image
| -rw-r--r-- | .github/workflows/main.yml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b775fe6f..d58e3e41 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,8 @@ name: CI env: DEFAULT_DOCKER_IMAGE: nicolargo/glances NODE_ENV: ${{ (contains('refs/heads/master', github.ref) || startsWith(github.ref, 'refs/tags/v')) && 'prod' || 'dev' }} - DOCKER_PLATFORMS: linux/amd64,linux/arm/v7,linux/arm64,linux/386 + PUSH_BRANCH: ${{ 'refs/heads/develop' == github.ref || 'refs/heads/master' == github.ref || startsWith(github.ref, 'refs/tags/v') }} + DOCKER_PLATFORMS: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386 on: pull_request: @@ -32,7 +33,6 @@ jobs: env: DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE || env.DEFAULT_DOCKER_IMAGE }} DOCKERFILE: ${{ env.NODE_ENV == 'prod' && './docker-files/Dockerfile' || './docker-files/dev.Dockerfile' }} - PUSH_IMAGE: ${{ env.NODE_ENV == 'prod' && 'true' || 'false' }} run: | ls -la /tmp/.buildx-cache || true VERSION=latest @@ -47,7 +47,6 @@ jobs: echo "DOCKERFILE=${DOCKERFILE}" >> $GITHUB_ENV echo "VERSION=${VERSION}" >> $GITHUB_ENV - echo "PUSH_IMAGE=${PUSH_IMAGE}" >> $GITHUB_ENV echo "TAGS=${DOCKER_IMAGE}:${VERSION}" >> $GITHUB_ENV echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV echo "VCS_REF=${GITHUB_SHA::8}" >> $GITHUB_ENV @@ -65,7 +64,7 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v1 - if: ${{env.PUSH_IMAGE == 'true'}} + if: ${{ env.PUSH_BRANCH == 'true' }} with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} @@ -73,7 +72,7 @@ jobs: - name: Build and push uses: docker/build-push-action@v2 with: - push: ${{env.PUSH_IMAGE == 'true'}} + push: ${{ env.PUSH_BRANCH == 'true' }} tags: ${{env.TAGS}} build-args: | VERSION=${{env.VERSION}} |