diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3fa1b18..e509691 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -31,7 +31,7 @@ jobs: deploy: name: Deploy - uses: sdr-enthusiasts/common-github-workflows/.github/workflows/build_and_push_image.yml@main + uses: sdr-enthusiasts/common-github-workflows/.github/workflows/sdre.yml@main with: push_enabled: true push_destinations: ghcr.io @@ -41,5 +41,6 @@ jobs: build_version_specific: false build_platform_specific: false build_nohealthcheck: false + platform_linux_arm32v7_enabled: false secrets: ghcr_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test_build.yaml b/.github/workflows/test_build.yaml index 36cfaac..d5ece5a 100644 --- a/.github/workflows/test_build.yaml +++ b/.github/workflows/test_build.yaml @@ -14,6 +14,7 @@ jobs: ghcr_repo_owner: ${{ github.repository_owner }} ghcr_repo: ${{ github.repository }} docker_build_file: Dockerfile + platform_linux_arm32v7_enabled: false secrets: ghcr_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Dockerfile b/Dockerfile index 73f3cbc..44bc170 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM jlesage/baseimage-gui:debian-11-v4.6.4 +FROM jlesage/baseimage-gui:debian-13-v4.11.3 SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -6,7 +6,6 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN set -x && \ TEMP_PACKAGES=() && \ KEPT_PACKAGES=() && \ - # General tools to get and build packages TEMP_PACKAGES+=(build-essential) && \ TEMP_PACKAGES+=(automake) && \ @@ -15,11 +14,9 @@ RUN set -x && \ TEMP_PACKAGES+=(cmake) && \ TEMP_PACKAGES+=(git) && \ TEMP_PACKAGES+=(pkg-config) && \ - # dependencies for rtl-sdr TEMP_PACKAGES+=(libusb-1.0-0-dev) && \ KEPT_PACKAGES+=(libusb-1.0-0) && \ - # Dependencies for SDRReceiver KEPT_PACKAGES+=(curl) && \ TEMP_PACKAGES+=(qtmultimedia5-dev) && \ @@ -41,18 +38,15 @@ RUN set -x && \ TEMP_PACKAGES+=(libogg-dev) && \ KEPT_PACKAGES+=(libogg0) && \ TEMP_PACKAGES+=(libqcustomplot-dev) && \ - KEPT_PACKAGES+=(libqcustomplot2.0) && \ + KEPT_PACKAGES+=(libqcustomplot2.1) && \ TEMP_PACKAGES+=(wget) && \ KEPT_PACKAGES+=(unzip) && \ - apt-get update && \ apt-get install -y --no-install-recommends \ "${KEPT_PACKAGES[@]}" \ "${TEMP_PACKAGES[@]}" \ && \ - # RTLSDR - Clone and build - git clone --branch master --depth 1 --single-branch https://gitea.osmocom.org/sdr/rtl-sdr.git /src/rtl-sdr && \ mkdir -p /src/rtl-sdr/build && \ pushd /src/rtl-sdr/build && \ @@ -67,7 +61,6 @@ RUN set -x && \ make install && \ popd && \ ldconfig && \ - # SDRReceiver git clone --depth 1 --single-branch https://github.com/jeroenbeijer/SDRReceiver.git /src/sdrreceiver && \ pushd /src/sdrreceiver && \ @@ -76,13 +69,11 @@ RUN set -x && \ make install && \ popd && \ ldconfig && \ - # Clean up apt-get remove -y "${TEMP_PACKAGES[@]}" && \ apt-get autoremove -y && \ rm -rf /src/* /tmp/* /var/lib/apt/lists/* && \ find /var/log -type f -exec truncate --size=0 {} \; && \ - set-cont-env APP_NAME "SDRReceiver" EXPOSE 5800 5900 6003 diff --git a/renovate.json b/renovate.json index 9f6016b..a678952 100644 --- a/renovate.json +++ b/renovate.json @@ -30,7 +30,8 @@ { "matchDatasources": ["docker"], "matchPackageNames": ["/^ghcr\\.io/sdr-enthusiasts/.*$/"], - "enabled": false + "enabled": true, + "automerge": true } ] }