Forráskód Böngészése

Apply suggestions from code review

Co-authored-by: Cody Robibero <cody@robibe.ro>
Marcel 3 éve
szülő
commit
32d6e7db7c
3 módosított fájl, 2 hozzáadás és 5 törlés
  1. 1 2
      Dockerfile
  2. 1 2
      Dockerfile.arm
  3. 0 1
      Dockerfile.arm64

+ 1 - 2
Dockerfile

@@ -29,7 +29,7 @@ ARG LEVEL_ZERO_VERSION=1.2.20826
 
 # Install dependencies:
 # mesa-va-drivers: needed for AMD VAAPI. Mesa >= 20.1 is required for HEVC transcoding.
-# curl: healcheck
+# curl: healthcheck
 RUN apt-get update \
  && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates gnupg wget apt-transport-https curl \
  && wget -O - https://repo.jellyfin.org/jellyfin_team.gpg.key | apt-key add - \
@@ -88,6 +88,5 @@ ENTRYPOINT ["./jellyfin/jellyfin", \
     "--ffmpeg", "/usr/lib/jellyfin-ffmpeg/ffmpeg"]
 
 HEALTHCHECK --interval=30s --timeout=30s --start-period=10s --retries=3 \
-    # https://github.com/jellyfin/jellyfin/issues/5760#issuecomment-852297561
     CMD  curl http://localhost:$(grep -oP '(?<=PublicPort>)[^<]+' /config/config/network.xml)/$(grep -oP '(?<=BaseUrl>)[^<]+' /config/config/network.xml)health \
     || exit 1

+ 1 - 2
Dockerfile.arm

@@ -25,7 +25,7 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 
 COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
 
-# curl: setup & healcheck
+# curl: setup & healthcheck
 RUN apt-get update \
  && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates gnupg curl && \
  curl -ks https://repo.jellyfin.org/debian/jellyfin_team.gpg.key | apt-key add - && \
@@ -79,6 +79,5 @@ ENTRYPOINT ["./jellyfin/jellyfin", \
     "--ffmpeg", "/usr/lib/jellyfin-ffmpeg/ffmpeg"]
 
 HEALTHCHECK --interval=30s --timeout=30s --start-period=10s --retries=3 \
-    # https://github.com/jellyfin/jellyfin/issues/5760#issuecomment-852297561
     CMD  curl http://localhost:$(grep -oP '(?<=PublicPort>)[^<]+' /config/config/network.xml)/$(grep -oP '(?<=BaseUrl>)[^<]+' /config/config/network.xml)health \
     || exit 1

+ 0 - 1
Dockerfile.arm64

@@ -70,6 +70,5 @@ ENTRYPOINT ["./jellyfin/jellyfin", \
     "--ffmpeg", "/usr/bin/ffmpeg"]
 
 HEALTHCHECK --interval=30s --timeout=30s --start-period=10s --retries=3 \
-    # https://github.com/jellyfin/jellyfin/issues/5760#issuecomment-852297561
     CMD  curl http://localhost:$(grep -oP '(?<=PublicPort>)[^<]+' /config/config/network.xml)/$(grep -oP '(?<=BaseUrl>)[^<]+' /config/config/network.xml)health \
     || exit 1