From 404c8ca93bb61fbc9ab40df48b37f38ed2a196a7 Mon Sep 17 00:00:00 2001 From: thursday Date: Fri, 28 Jul 2023 11:37:13 -0400 Subject: [PATCH] Depreciate Arm(hf). --- .../workflows/docker-build-and-publish.yml | 141 ++---------------- README.md | 2 + p7zip/Dockerfile.armhf | 83 ----------- unarr/Dockerfile.armhf | 91 ----------- 4 files changed, 11 insertions(+), 306 deletions(-) delete mode 100644 p7zip/Dockerfile.armhf delete mode 100644 unarr/Dockerfile.armhf diff --git a/.github/workflows/docker-build-and-publish.yml b/.github/workflows/docker-build-and-publish.yml index 5326707..67894dc 100644 --- a/.github/workflows/docker-build-and-publish.yml +++ b/.github/workflows/docker-build-and-publish.yml @@ -140,72 +140,6 @@ jobs: ${{ steps.gh-meta.outputs.tags }}-arm64v8 labels: ${{ steps.dh-meta.outputs.labels }} - build-unarr-arm32v7: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Docker meta - id: dh-meta - uses: docker/metadata-action@v4 - with: - images: | - ${{ env.DOCKERHUB_SLUG }} - flavor: latest=false - tags: | - type=ref,event=tag - - - name: Docker meta - id: gh-meta - uses: docker/metadata-action@v4 - with: - images: | - ${{ env.GHCR_SLUG }} - flavor: latest=false - tags: | - type=ref,event=tag - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to Dockerhub - uses: docker/login-action@v2 - with: - registry: docker.io - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push container image - uses: docker/build-push-action@v4 - with: - push: true - provenance: false - context: unarr - file: unarr/Dockerfile.armhf - platforms: linux/arm/v7 - tags: | - ${{ env.DOCKERHUB_SLUG }}:unarr-arm32v7 - ${{ env.DOCKERHUB_SLUG }}:latest-arm32v7 - ${{ env.GHCR_SLUG }}:unarr-arm32v7 - ${{ env.GHCR_SLUG }}:latest-arm32v7 - ${{ steps.dh-meta.outputs.tags }}-arm32v7 - ${{ steps.gh-meta.outputs.tags }}-arm32v7 - labels: ${{ steps.dh-meta.outputs.labels }} - build-p7zip-amd64: runs-on: ubuntu-latest permissions: @@ -285,49 +219,8 @@ jobs: ${{ env.DOCKERHUB_SLUG }}:p7zip-arm64v8 ${{ env.GHCR_SLUG }}:p7zip-arm64v8 - build-p7zip-arm32v7: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to Dockerhub - uses: docker/login-action@v2 - with: - registry: docker.io - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push container image - uses: docker/build-push-action@v4 - with: - push: true - provenance: false - context: p7zip - file: p7zip/Dockerfile.armhf - platforms: linux/arm/v7 - tags: | - ${{ env.DOCKERHUB_SLUG }}:p7zip-arm32v7 - ${{ env.GHCR_SLUG }}:p7zip-arm32v7 - push-manifest: - needs: [build-unarr-amd64, build-unarr-arm64v8, build-unarr-arm32v7, build-p7zip-amd64, build-p7zip-arm64v8, build-p7zip-arm32v7] + needs: [build-unarr-amd64, build-unarr-arm64v8, build-p7zip-amd64, build-p7zip-arm64v8] runs-on: ubuntu-latest steps: - name: Checkout @@ -378,35 +271,27 @@ jobs: # get artifacts from previous steps and integrate into one multi-arch manifest docker pull --platform=linux/amd64 ${{ env.DOCKERHUB_SLUG }}:unarr-amd64 docker pull --platform=linux/arm64 ${{ env.DOCKERHUB_SLUG }}:unarr-arm64v8 - docker pull --platform=linux/arm/v7 ${{ env.DOCKERHUB_SLUG }}:unarr-arm32v7 docker pull --platform=linux/amd64 ${{ env.DOCKERHUB_SLUG }}:latest-amd64 docker pull --platform=linux/arm64 ${{ env.DOCKERHUB_SLUG }}:latest-arm64v8 - docker pull --platform=linux/arm/v7 ${{ env.DOCKERHUB_SLUG }}:latest-arm32v7 docker pull --platform=linux/amd64 ${{ env.DOCKERHUB_SLUG }}:p7zip-amd64 docker pull --platform=linux/arm64 ${{ env.DOCKERHUB_SLUG }}:p7zip-arm64v8 - docker pull --platform=linux/arm/v7 ${{ env.DOCKERHUB_SLUG }}:p7zip-arm32v7 docker pull --platform=linux/amd64 ${{ steps.dh-meta.outputs.tags }}-amd64 docker pull --platform=linux/arm64 ${{ steps.dh-meta.outputs.tags }}-arm64v8 - docker pull --platform=linux/arm/v7 ${{ steps.dh-meta.outputs.tags }}-arm32v7 - docker manifest create ${{ env.DOCKERHUB_SLUG }}:latest ${{ env.DOCKERHUB_SLUG }}:latest-amd64 ${{ env.DOCKERHUB_SLUG }}:latest-arm64v8 ${{ env.DOCKERHUB_SLUG }}:latest-arm32v7 + docker manifest create ${{ env.DOCKERHUB_SLUG }}:latest ${{ env.DOCKERHUB_SLUG }}:latest-amd64 ${{ env.DOCKERHUB_SLUG }}:latest-arm64v8 docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:latest --os linux --arch amd64 ${{ env.DOCKERHUB_SLUG }}:latest-amd64 docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:latest --os linux --arch arm64 --variant v8 ${{ env.DOCKERHUB_SLUG }}:latest-arm64v8 - docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:latest --os linux --arch arm --variant v7 ${{ env.DOCKERHUB_SLUG }}:latest-arm32v7 docker manifest push ${{ env.DOCKERHUB_SLUG }}:latest - docker manifest create ${{ env.DOCKERHUB_SLUG }}:unarr ${{ env.DOCKERHUB_SLUG }}:unarr-amd64 --amend ${{ env.DOCKERHUB_SLUG }}:unarr-arm64v8 --amend ${{ env.DOCKERHUB_SLUG }}:unarr-arm32v7 + docker manifest create ${{ env.DOCKERHUB_SLUG }}:unarr ${{ env.DOCKERHUB_SLUG }}:unarr-amd64 --amend ${{ env.DOCKERHUB_SLUG }}:unarr-arm64v8 --amend docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:unarr --os linux --arch amd64 ${{ env.DOCKERHUB_SLUG }}:unarr-amd64 docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:unarr --os linux --arch arm64 --variant v8 ${{ env.DOCKERHUB_SLUG }}:unarr-arm64v8 - docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:unarr --os linux --arch arm --variant v7 ${{ env.DOCKERHUB_SLUG }}:unarr-arm32v7 docker manifest push ${{ env.DOCKERHUB_SLUG }}:unarr - docker manifest create ${{ env.DOCKERHUB_SLUG }}:p7zip ${{ env.DOCKERHUB_SLUG }}:p7zip-amd64 ${{ env.DOCKERHUB_SLUG }}:p7zip-arm64v8 ${{ env.DOCKERHUB_SLUG }}:p7zip-arm32v7 + docker manifest create ${{ env.DOCKERHUB_SLUG }}:p7zip ${{ env.DOCKERHUB_SLUG }}:p7zip-amd64 ${{ env.DOCKERHUB_SLUG }}:p7zip-arm64v8 docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:p7zip --os linux --arch amd64 ${{ env.DOCKERHUB_SLUG }}:p7zip-amd64 docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:p7zip --os linux --arch arm64 --variant v8 ${{ env.DOCKERHUB_SLUG }}:p7zip-arm64v8 - docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:p7zip --os linux --arch arm --variant v7 ${{ env.DOCKERHUB_SLUG }}:p7zip-arm32v7 docker manifest push ${{ env.DOCKERHUB_SLUG }}:p7zip - docker manifest create ${{ steps.dh-meta.outputs.tags }} ${{ steps.dh-meta.outputs.tags }}-amd64 ${{ steps.dh-meta.outputs.tags }}-arm64v8 ${{ steps.dh-meta.outputs.tags }}-arm32v7 + docker manifest create ${{ steps.dh-meta.outputs.tags }} ${{ steps.dh-meta.outputs.tags }}-amd64 ${{ steps.dh-meta.outputs.tags }}-arm64v8 docker manifest annotate ${{ steps.dh-meta.outputs.tags }} --os linux --arch amd64 ${{ steps.dh-meta.outputs.tags }}-amd64 docker manifest annotate ${{ steps.dh-meta.outputs.tags }} --os linux --arch arm64 --variant v8 ${{ steps.dh-meta.outputs.tags }}-arm64v8 - docker manifest annotate ${{ steps.dh-meta.outputs.tags }} --os linux --arch arm --variant v7 ${{ steps.dh-meta.outputs.tags }}-arm32v7 docker manifest push ${{ steps.dh-meta.outputs.tags }} @@ -414,33 +299,25 @@ jobs: run: | docker pull --platform=linux/amd64 ${{ env.GHCR_SLUG }}:unarr-amd64 docker pull --platform=linux/arm64 ${{ env.GHCR_SLUG }}:unarr-arm64v8 - docker pull --platform=linux/arm/v7 ${{ env.GHCR_SLUG }}:unarr-arm32v7 docker pull --platform=linux/amd64 ${{ env.GHCR_SLUG }}:latest-amd64 docker pull --platform=linux/arm64 ${{ env.GHCR_SLUG }}:latest-arm64v8 - docker pull --platform=linux/arm/v7 ${{ env.GHCR_SLUG }}:latest-arm32v7 docker pull --platform=linux/amd64 ${{ env.GHCR_SLUG }}:p7zip-amd64 docker pull --platform=linux/arm64 ${{ env.GHCR_SLUG }}:p7zip-arm64v8 - docker pull --platform=linux/arm/v7 ${{ env.GHCR_SLUG }}:p7zip-arm32v7 docker pull --platform=linux/amd64 ${{ steps.gh-meta.outputs.tags }}-amd64 docker pull --platform=linux/arm64 ${{ steps.gh-meta.outputs.tags }}-arm64v8 - docker pull --platform=linux/arm/v7 ${{ steps.gh-meta.outputs.tags }}-arm32v7 - docker manifest create -a ${{ env.GHCR_SLUG }}:unarr ${{ env.GHCR_SLUG }}:unarr-amd64 ${{ env.GHCR_SLUG }}:unarr-arm64v8 ${{ env.GHCR_SLUG }}:unarr-arm32v7 + docker manifest create -a ${{ env.GHCR_SLUG }}:unarr ${{ env.GHCR_SLUG }}:unarr-amd64 ${{ env.GHCR_SLUG }}:unarr-arm64v8 docker manifest annotate ${{ env.GHCR_SLUG }}:unarr --os linux --arch amd64 ${{ env.GHCR_SLUG }}:unarr-amd64 docker manifest annotate ${{ env.GHCR_SLUG }}:unarr --os linux --arch arm64 --variant v8 ${{ env.GHCR_SLUG }}:unarr-arm64v8 - docker manifest annotate ${{ env.GHCR_SLUG }}:unarr --os linux --arch arm --variant v7 ${{ env.GHCR_SLUG }}:unarr-arm32v7 docker manifest push ${{ env.GHCR_SLUG }}:unarr - docker manifest create ${{ env.GHCR_SLUG }}:p7zip ${{ env.GHCR_SLUG }}:p7zip-amd64 ${{ env.GHCR_SLUG }}:p7zip-arm64v8 ${{ env.GHCR_SLUG }}:p7zip-arm32v7 + docker manifest create ${{ env.GHCR_SLUG }}:p7zip ${{ env.GHCR_SLUG }}:p7zip-amd64 ${{ env.GHCR_SLUG }}:p7zip-arm64v8 docker manifest annotate ${{ env.GHCR_SLUG }}:p7zip --os linux --arch amd64 ${{ env.GHCR_SLUG }}:p7zip-amd64 docker manifest annotate ${{ env.GHCR_SLUG }}:p7zip --os linux --arch arm64 --variant v8 ${{ env.GHCR_SLUG }}:p7zip-arm64v8 - docker manifest annotate ${{ env.GHCR_SLUG }}:p7zip --os linux --arch arm --variant v7 ${{ env.GHCR_SLUG }}:p7zip-arm32v7 docker manifest push ${{ env.GHCR_SLUG }}:p7zip - docker manifest create ${{ env.GHCR_SLUG }}:latest ${{ env.GHCR_SLUG }}:latest-amd64 ${{ env.GHCR_SLUG }}:latest-arm64v8 ${{ env.GHCR_SLUG }}:latest-arm32v7 + docker manifest create ${{ env.GHCR_SLUG }}:latest ${{ env.GHCR_SLUG }}:latest-amd64 ${{ env.GHCR_SLUG }}:latest-arm64v8 docker manifest annotate ${{ env.GHCR_SLUG }}:latest --os linux --arch amd64 ${{ env.GHCR_SLUG }}:latest-amd64 docker manifest annotate ${{ env.GHCR_SLUG }}:latest --os linux --arch arm64 --variant v8 ${{ env.GHCR_SLUG }}:latest-arm64v8 - docker manifest annotate ${{ env.GHCR_SLUG }}:latest --os linux --arch arm --variant v7 ${{ env.GHCR_SLUG }}:latest-arm32v7 docker manifest push ${{ env.GHCR_SLUG }}:latest - docker manifest create ${{ steps.gh-meta.outputs.tags }} ${{ steps.gh-meta.outputs.tags }}-amd64 ${{ steps.gh-meta.outputs.tags }}-arm64v8 ${{ steps.gh-meta.outputs.tags }}-arm32v7 + docker manifest create ${{ steps.gh-meta.outputs.tags }} ${{ steps.gh-meta.outputs.tags }}-amd64 ${{ steps.gh-meta.outputs.tags }}-arm64v8 docker manifest annotate ${{ steps.gh-meta.outputs.tags }} --os linux --arch amd64 ${{ steps.gh-meta.outputs.tags }}-amd64 docker manifest annotate ${{ steps.gh-meta.outputs.tags }} --os linux --arch arm64 --variant v8 ${{ steps.gh-meta.outputs.tags }}-arm64v8 - docker manifest annotate ${{ steps.gh-meta.outputs.tags }} --os linux --arch arm --variant v7 ${{ steps.gh-meta.outputs.tags }}-arm32v7 docker manifest push ${{ steps.gh-meta.outputs.tags }} diff --git a/README.md b/README.md index 886a055..17c12d2 100644 --- a/README.md +++ b/README.md @@ -170,6 +170,8 @@ Here are the instructions for updating containers: ## Versions +* **28.07.23:** - Update YACReader to 9.13.1 and depreciated 32-bit Arm(hf) image. + * **25.04.23:** - Update YACReader to 9.12.0. * **04.04.23:** - Update YACReader to 9.11.0 and fix CI build process. diff --git a/p7zip/Dockerfile.armhf b/p7zip/Dockerfile.armhf deleted file mode 100644 index dfdc5c9..0000000 --- a/p7zip/Dockerfile.armhf +++ /dev/null @@ -1,83 +0,0 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy - -# package versions -ARG YACR_VERSION="9.13.1" - -# env variables -ARG DEBIAN_FRONTEND="noninteractive" -ENV APPNAME="YACReaderLibraryServer" -ENV HOME="/config" -LABEL maintainer="xthursdayx" - -# install build & runtime packages -RUN \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - build-essential \ - desktop-file-utils \ - g++ \ - git \ - libglu1-mesa-dev \ - libpoppler-qt5-dev \ - libpoppler-qt5-1 \ - libqt5core5a \ - libqt5gui5 \ - libqt5multimedia5 \ - libqt5network5 \ - libqt5opengl5-dev \ - libqt5qml5 \ - libqt5quickcontrols2-5 \ - libqt5script5 \ - libqt5sql5-sqlite \ - libqt5sql5 \ - libqt5svg5-dev \ - libsqlite3-dev \ - make \ - qtchooser \ - qtbase5-dev-tools \ - qt5-qmake \ - qtbase5-dev \ - qtmultimedia5-dev \ - qt5-image-formats-plugins \ - qtdeclarative5-dev \ - qtquickcontrols2-5-dev \ - qtscript5-dev \ - qttools5-dev-tools \ - sqlite3 \ - unzip \ - wget && \ -# clone yacreaderlibraryserver - git clone -b master --single-branch https://github.com/YACReader/yacreader.git /src/git && \ - cd /src/git && \ - git checkout $YACR_VERSION && \ -# install p7zip libraries - cd /src/git/compressed_archive && \ - wget "https://sourceforge.net/projects/p7zip/files/p7zip/16.02/p7zip_16.02_src_all.tar.bz2" && \ - tar xjf /src/git/compressed_archive/p7zip_16.02_src_all.tar.bz2 -C /src/git/compressed_archive && \ - mv /src/git/compressed_archive/p7zip_16.02 /src/git/compressed_archive/libp7zip && \ -# build yacreaderlibraryserver - cd /src/git/YACReaderLibraryServer && \ - qmake PREFIX=/app "CONFIG+=7zip server_standalone" YACReaderLibraryServer.pro && \ - make && \ - make install && \ -# clean up - cd / && \ - apt-get clean && \ - apt-get purge -y build-essential g++ git make qt5-qmake unzip wget && \ - apt-get -y autoremove && \ - rm -rf \ - /src \ - /tmp/* \ - /var/cache/apt \ - /var/lib/apt/lists/* - -# set ENV -ENV LC_ALL="en_US.UTF-8" \ - PATH="/app/bin:${PATH}" - -# copy files -COPY root/ / - -# ports and volumes -EXPOSE 8080 -VOLUME ["/config", "/comics"] diff --git a/unarr/Dockerfile.armhf b/unarr/Dockerfile.armhf deleted file mode 100644 index 24e9f64..0000000 --- a/unarr/Dockerfile.armhf +++ /dev/null @@ -1,91 +0,0 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy - -# package versions -ARG YACR_VERSION="9.13.1" - -# env variables -ARG DEBIAN_FRONTEND="noninteractive" -ENV APPNAME="YACReaderLibraryServer" -ENV HOME="/config" -LABEL maintainer="xthursdayx" - -# install build & runtime packages -RUN \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - build-essential \ - cmake \ - desktop-file-utils \ - g++ \ - git \ - libbz2-dev \ - libglu1-mesa-dev \ - liblzma-dev \ - libpoppler-qt5-dev \ - libpoppler-qt5-1 \ - libqt5core5a \ - libqt5gui5 \ - libqt5multimedia5 \ - libqt5network5 \ - libqt5opengl5-dev \ - libqt5qml5 \ - libqt5quickcontrols2-5 \ - libqt5script5 \ - libqt5sql5-sqlite \ - libqt5sql5 \ - libqt5svg5 \ - libsqlite3-dev \ - make \ - mercurial \ - qtbase5-dev \ - qt5-image-formats-plugins \ - qt5-qmake \ - qtdeclarative5-dev \ - qtmultimedia5-dev \ - qtscript5-dev \ - sqlite3 \ - unzip \ - wget \ - zlib1g-dev && \ -# clone yacreaderlibraryserver - git clone -b master --single-branch https://github.com/YACReader/yacreader.git /src/git && \ - cd /src/git && \ - git checkout $YACR_VERSION && \ -# install unarr libraries -# cd /src/git/compressed_archive/unarr && \ -# git clone https://github.com/selmf/unarr.git unarr-master && \ -# cd unarr-master/lzmasdk && \ -# ln -s 7zTypes.h Types.h && \ - git clone -b master --single-branch https://github.com/selmf/unarr.git /tmp/unarr && \ - cd /tmp/unarr && \ - mkdir -p build && \ - cd build && \ - cmake -DENABLE_7Z=ON .. && \ - make && \ - make install && \ -# build yacreaderlibraryserver - cd /src/git/YACReaderLibraryServer && \ - qmake PREFIX=/app "CONFIG+=unarr server_standalone" YACReaderLibraryServer.pro && \ - make && \ - make install && \ -# clean up - cd / && \ - apt-get clean && \ - apt-get purge -y build-essential cmake g++ git make qt5-qmake unzip wget && \ - apt-get -y autoremove && \ - rm -rf \ - /src \ - /tmp/* \ - /var/cache/apt \ - /var/lib/apt/lists/* - -# set ENV -ENV LC_ALL="en_US.UTF-8" \ - PATH="/app/bin:${PATH}" - -# copy files -COPY root/ / - -# ports and volumes -EXPOSE 8080 -VOLUME ["/config", "/comics"]