fix docker build

This commit is contained in:
Roland Dobai 2025-02-26 10:40:14 +01:00
parent 2abf7c6ec5
commit 8bf14ac772
2 changed files with 15 additions and 22 deletions

View File

@ -5,11 +5,6 @@ concurrency:
on:
push:
branches:
- 'master'
- 'release/*'
tags:
- 'v*.*'
env:
# Platforms to build the image for
@ -27,21 +22,10 @@ jobs:
# as a build arg) and TAG_NAME (used when tagging the image).
#
# The following 3 steps cover the alternatives (tag, release branch, master branch):
- name: Set variables (tags)
if: ${{ github.ref_type == 'tag' }}
run: |
echo "CLONE_BRANCH_OR_TAG=$GITHUB_REF_NAME" >> $GITHUB_ENV
echo "TAG_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV
- name: Set variables (release branches)
if: ${{ github.ref_type == 'branch' && startsWith(github.ref_name, 'release/') }}
run: |
echo "CLONE_BRANCH_OR_TAG=$GITHUB_REF_NAME" >> $GITHUB_ENV
echo "TAG_NAME=release-${GITHUB_REF_NAME##release/}" >> $GITHUB_ENV
- name: Set variables (main branch)
if: ${{ github.ref_type == 'branch' && github.ref_name == 'master' }}
run: |
echo "CLONE_BRANCH_OR_TAG=master" >> $GITHUB_ENV
echo "TAG_NAME=latest" >> $GITHUB_ENV
echo "TAG_NAME=release-v5.3" >> $GITHUB_ENV
# Display the variables set above, just in case.
- name: Check variables
@ -60,14 +44,18 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Set up QEMU for multiarch builds
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
image: tonistiigi/binfmt:qemu-v7.0.0-28
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
cache-binary: false
- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
context: tools/docker
push: true
push: false
tags: ${{ env.DOCKERHUB_REPO }}:${{ env.TAG_NAME }}
platforms: ${{ env.BUILD_PLATFORMS }}
build-args: |

View File

@ -2,6 +2,11 @@ FROM ubuntu:22.04
ARG DEBIAN_FRONTEND=noninteractive
# Unpacking libc-bin (2.35-0ubuntu3.9) over (2.35-0ubuntu3.8)
# Errors were encountered while processing: libc-bin
RUN apt-get update \
&& apt-get install -y --no-install-recommends libc-bin
RUN : \
&& apt-get update \
&& apt-get install -y \
@ -29,6 +34,7 @@ RUN : \
ninja-build \
python3 \
python3-venv \
python-is-python3 \
ruby \
unzip \
wget \
@ -36,7 +42,6 @@ RUN : \
zip \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* \
&& update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \
&& :
# To build the image for a branch or a tag of IDF, pass --build-arg IDF_CLONE_BRANCH_OR_TAG=name.