From 36592caf610c889febf038a8725f173bcbf38264 Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Mon, 16 Oct 2023 03:10:57 +0200 Subject: [PATCH] Erweiterung fuer update && upgrade --- .github/workflows/docker_bullseye_unified.yml | 16 +++++++++++++--- ...ockerfile.bullseye.test_install_unified.armv7 | 4 ++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker_bullseye_unified.yml b/.github/workflows/docker_bullseye_unified.yml index a90fb39da..f277811c3 100644 --- a/.github/workflows/docker_bullseye_unified.yml +++ b/.github/workflows/docker_bullseye_unified.yml @@ -25,7 +25,6 @@ env: jobs: prepare: - name: Prepare base image for tests runs-on: ubuntu-latest steps: @@ -44,11 +43,23 @@ jobs: load: true push: false file: ./ci/Dockerfile.bullseye.test_install_unified.armv7 - target: test-update + target: test platforms: linux/arm/v7 tags: local/${{ env.DOCKER_IMAGE_NAME }}:cache cache-from: type=gha,scope=${{ env.CACHE_SCOPE }} cache-to: type=gha,mode=max,scope=${{ env.CACHE_SCOPE }} + + - name: Build Bullseye ARMv7 - Update + uses: docker/build-push-action@v5 + with: + context: . + load: true + push: false + file: ./ci/Dockerfile.bullseye.test_install_unified.armv7 + target: test-update + platforms: linux/arm/v7 + tags: local/${{ env.DOCKER_IMAGE_NAME }}:cache + cache-from: type=gha,scope=${{ env.CACHE_SCOPE }} outputs: type=docker,dest=${{ env._PATH_DOCKER_IMAGE_TAR }} - name: Cache Check Docker Image @@ -70,7 +81,6 @@ jobs: test: needs: prepare - name: Run tests runs-on: ubuntu-latest strategy: diff --git a/ci/Dockerfile.bullseye.test_install_unified.armv7 b/ci/Dockerfile.bullseye.test_install_unified.armv7 index f034b4c08..fe4713e0d 100644 --- a/ci/Dockerfile.bullseye.test_install_unified.armv7 +++ b/ci/Dockerfile.bullseye.test_install_unified.armv7 @@ -1,4 +1,4 @@ -FROM --platform=linux/arm/v7 arm32v7/debian:bullseye-slim as base +FROM debian:bullseye-slim as base # Define constants ENV DOCKER_RUNNING=true @@ -64,4 +64,4 @@ WORKDIR /tests FROM test as test-update -RUN sudo apt-get update && sudo apt-get upgrade +RUN sudo apt-get update && sudo apt-get -y upgrade