Remove docker image openocd-build-rpm-prerequisites, use fedora:37 in…

…stead and install dependencies locally
rleh · Mar 20, 2023 · 5d5ddc0 · 5d5ddc0
1 parent 40c810b
commit 5d5ddc0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git 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