From 1ad348b9a7a7b7d7ddec02d542a4ba56ee4a3e5a Mon Sep 17 00:00:00 2001 From: Connor Yoh Date: Sat, 15 Feb 2025 18:45:29 +0000 Subject: [PATCH] Removed duplicate package paths --- Dockerfile | 12 ++++++------ Dockerfile.fat | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index ab2fb6991..5a211ada5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,8 +39,8 @@ ENV DOCKER_ENABLE_SECURITY=false \ # JDK for app -RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \ - echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \ +RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \ + echo "@community https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \ echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \ apk upgrade --no-cache -a && \ apk add --no-cache \ @@ -66,10 +66,10 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et # CV py3-opencv \ python3 \ - -X https://dl-cdn.alpinelinux.org/alpine/edge/testing py3-unoconv \ - -X https://dl-cdn.alpinelinux.org/alpine/edge/testing py3-pillow \ - -X https://dl-cdn.alpinelinux.org/alpine/edge/testing py3-pdf2image \ - -X https://dl-cdn.alpinelinux.org/alpine/edge/community weasyprint && \ + py3-unoconv@testing \ + py3-pillow@testing \ + py3-pdf2image@testing \ + weasyprint@community && \ mv /usr/share/tessdata /usr/share/tessdata-original && \ mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \ fc-cache -f -v && \ diff --git a/Dockerfile.fat b/Dockerfile.fat index 2bd6f4d27..39b47fe16 100644 --- a/Dockerfile.fat +++ b/Dockerfile.fat @@ -41,8 +41,8 @@ ENV DOCKER_ENABLE_SECURITY=false \ # JDK for app -RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \ - echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \ +RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \ + echo "@community https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \ echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \ apk upgrade --no-cache -a && \ apk add --no-cache \ @@ -70,10 +70,10 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et py3-opencv \ # python3/pip python3 \ - -X https://dl-cdn.alpinelinux.org/alpine/edge/testing py3-unoconv \ - -X https://dl-cdn.alpinelinux.org/alpine/edge/testing py3-pillow \ - -X https://dl-cdn.alpinelinux.org/alpine/edge/testing py3-pdf2image \ - -X https://dl-cdn.alpinelinux.org/alpine/edge/community weasyprint && \ + py3-unoconv@testing \ + py3-pillow@testing \ + py3-pdf2image@testing \ + weasyprint@community && \ # uno unoconv and HTML mv /usr/share/tessdata /usr/share/tessdata-original && \ mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \