From e37817d2c066d5a8cb9dcbdeaed9762f82b22f0c Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Mon, 14 Oct 2024 17:10:27 -0400 Subject: [PATCH] use vcpkg-provided json-c on rocky8 --- .../actions/openziti-tunnel-build-action/redhat-8/Dockerfile | 1 - .../redhat-8/vcpkg-overlays/json-c/portfile.cmake | 1 - .../redhat-8/vcpkg-overlays/json-c/vcpkg.json | 4 ---- .../openziti-tunnel-build-action/ubuntu-20.04/Dockerfile | 1 - 4 files changed, 7 deletions(-) delete mode 100644 .github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/portfile.cmake delete mode 100644 .github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/vcpkg.json diff --git a/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile b/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile index 46c4eb35..4b83eb57 100644 --- a/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile +++ b/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile @@ -32,7 +32,6 @@ RUN dnf install -y \ doxygen \ graphviz \ git \ - json-c-devel \ ninja-build \ && dnf clean all diff --git a/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/portfile.cmake b/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/portfile.cmake deleted file mode 100644 index 0015715f..00000000 --- a/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/vcpkg.json b/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/vcpkg.json deleted file mode 100644 index ab78d592..00000000 --- a/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/vcpkg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "json-c", - "version": "0" -} \ No newline at end of file diff --git a/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/Dockerfile b/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/Dockerfile index d1b8d04c..c46ac0d3 100644 --- a/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/Dockerfile +++ b/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/Dockerfile @@ -27,7 +27,6 @@ RUN apt-get update \ doxygen \ git \ graphviz \ - libjson-c-dev \ libprotobuf-c-dev \ libsystemd-dev \ libtool \