From 5d5ddc069ed742f61da364e6192f92eba02cc7f2 Mon Sep 17 00:00:00 2001 From: Raphael Lehmann Date: Tue, 21 Mar 2023 00:01:22 +0100 Subject: [PATCH] Remove docker image openocd-build-rpm-prerequisites, use fedora:37 instead and install dependencies locally --- .github/workflows/build.yml | 9 +++++---- docker-openocd-build-rpm-prerequisites/Dockerfile | 9 --------- 2 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 docker-openocd-build-rpm-prerequisites/Dockerfile diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6149f32..d2a4f53 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -102,11 +102,12 @@ jobs: needs: init runs-on: ubuntu-22.04 container: - # To update: (cd docker-openocd-build-rpm-prerequisites/ && \ - # docker build -t ghcr.io/rleh/openocd-build-rpm-prerequisites:fedora37_2022-03-07 && \ - # docker push ghcr.io/rleh/openocd-build-rpm-prerequisites:fedora37_2022-03-07) - image: ghcr.io/rleh/openocd-build-rpm-prerequisites:fedora37_2022-03-07 + image: fedora:37 steps: + - name: Update Fedora and install dependencies + run: | + dnf update -y + dnf install -y make libtool pkg-config autoconf automake texinfo tree libusbx-devel hidapi-devel libftdi-devel rpm git which zip rpm-build capstone-devel chrpath jimtcl-devel libjaylink-devel libgpiod-devel sdcc - name: Build Version run: | echo "BUILD_VERSION=${{ needs.init.outputs.build_version }}" >> $GITHUB_ENV diff --git a/docker-openocd-build-rpm-prerequisites/Dockerfile b/docker-openocd-build-rpm-prerequisites/Dockerfile deleted file mode 100644 index 5881dfa..0000000 --- a/docker-openocd-build-rpm-prerequisites/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM fedora:37 -LABEL maintainer="Raphael Lehmann " -LABEL Description="Image for building the upstream OpenOCD RPM package on Fedora" -WORKDIR /work - -RUN dnf update -y \ - && dnf install -y make libtool pkg-config autoconf automake texinfo tree libusbx-devel hidapi-devel libftdi-devel rpm git which zip rpm-build capstone-devel chrpath jimtcl-devel libjaylink-devel libgpiod-devel sdcc \ - && dnf clean all \ - && rm -rf /var/cache/yum