From 4a42326b274f0546ce54b010200f6065c2c4a4f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Sch=C3=B6ppach?= Date: Mon, 5 Aug 2024 16:53:45 +0200 Subject: [PATCH] Create image with gcc13 --- .github/workflows/build-container.yml | 1 + .gitlab-ci.yml | 4 ++-- Dockerfile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index 5025c44..e31f014 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -10,4 +10,5 @@ jobs: uses: macbre/push-to-ghcr@master with: image_name: bestsens/stm32-build-image + image_tag: ${{ github.ref }} github_token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0227e3..2473c30 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,5 +23,5 @@ build-image:latest: needs: ["build-image"] script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - docker build --pull -t $CI_REGISTRY_IMAGE:latest . - - docker push $CI_REGISTRY_IMAGE:latest + - docker build --pull -t $CI_REGISTRY_IMAGE:gcc13 . + - docker push $CI_REGISTRY_IMAGE:gcc13 diff --git a/Dockerfile b/Dockerfile index 65eae86..884c773 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20 +FROM alpine:3.19 RUN apk add --no-cache \ gcc-arm-none-eabi \ g++-arm-none-eabi \