luisgulo/photoprism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Docker: Skip changing permissions of the original folder #2371

Browse Source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2022-08-01 15:40:16 +02:00
parent 0e1222c830
commit f06d768e78
7 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/photoprism/armv7/Dockerfile
View File

@ -77,7 +77,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
PHOTOPRISM_AUTO_IMPORT=300 PHOTOPRISM_AUTO_IMPORT=300
# copy dist files, scripts, and debian backports sources list # copy dist files, scripts, and debian backports sources list
COPY --from=build /opt/photoprism/ /opt/photoprism COPY --from=build --chown=root:root --chmod=755 /opt/photoprism/ /opt/photoprism
COPY --chown=root:root --chmod=755 /scripts/dist/* /scripts/ COPY --chown=root:root --chmod=755 /scripts/dist/* /scripts/
COPY /docker/develop/bookworm/sources.list /etc/apt/sources.list.d/bookworm.list COPY /docker/develop/bookworm/sources.list /etc/apt/sources.list.d/bookworm.list
@ -88,8 +88,6 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \
echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \
mv /opt/photoprism/sbin/gosu /usr/local/sbin/gosu && \ mv /opt/photoprism/sbin/gosu /usr/local/sbin/gosu && \
chown root:root /usr/local/sbin/gosu && \
chmod 755 /usr/local/sbin/gosu && \
apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \ apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \
libc6 ca-certificates sudo bash tzdata \ libc6 ca-certificates sudo bash tzdata \
gpg zip unzip wget curl rsync make nano \ gpg zip unzip wget curl rsync make nano \

6
docker/photoprism/bookworm/Dockerfile
View File

@ -86,10 +86,8 @@ WORKDIR /photoprism
EXPOSE 2342 EXPOSE 2342
# copy dist files # copy dist files
COPY --from=build /opt/photoprism/ /opt/photoprism COPY --from=build --chown=root:root --chmod=755 /opt/photoprism/ /opt/photoprism
RUN mv /opt/photoprism/sbin/gosu /usr/local/sbin/gosu && \ RUN mv /opt/photoprism/sbin/gosu /usr/local/sbin/gosu
chown root:root /usr/local/sbin/gosu && \
chmod 755 /usr/local/sbin/gosu
# set container entrypoint script # set container entrypoint script
ENTRYPOINT ["/scripts/entrypoint.sh"] ENTRYPOINT ["/scripts/entrypoint.sh"]

6
docker/photoprism/bullseye/Dockerfile
View File

@ -86,10 +86,8 @@ WORKDIR /photoprism
EXPOSE 2342 EXPOSE 2342
# copy dist files # copy dist files
COPY --from=build /opt/photoprism/ /opt/photoprism COPY --from=build --chown=root:root --chmod=755 /opt/photoprism/ /opt/photoprism
RUN mv /opt/photoprism/sbin/gosu /usr/local/sbin/gosu && \ RUN mv /opt/photoprism/sbin/gosu /usr/local/sbin/gosu
chown root:root /usr/local/sbin/gosu && \
chmod 755 /usr/local/sbin/gosu
# set container entrypoint script # set container entrypoint script
ENTRYPOINT ["/scripts/entrypoint.sh"] ENTRYPOINT ["/scripts/entrypoint.sh"]

4
docker/photoprism/buster/Dockerfile
View File

@ -77,7 +77,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
PHOTOPRISM_AUTO_IMPORT=300 PHOTOPRISM_AUTO_IMPORT=300
# copy dist files, scripts, and debian backports sources list # copy dist files, scripts, and debian backports sources list
COPY --from=build /opt/photoprism/ /opt/photoprism COPY --from=build --chown=root:root --chmod=755 /opt/photoprism/ /opt/photoprism
COPY --chown=root:root --chmod=755 /scripts/dist/* /scripts/ COPY --chown=root:root --chmod=755 /scripts/dist/* /scripts/
COPY --chown=root:root --chmod=644 /docker/develop/buster/sources.list /etc/apt/sources.list.d/buster.list COPY --chown=root:root --chmod=644 /docker/develop/buster/sources.list /etc/apt/sources.list.d/buster.list
@ -88,8 +88,6 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \
echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \
mv /opt/photoprism/sbin/gosu /usr/local/sbin/gosu && \ mv /opt/photoprism/sbin/gosu /usr/local/sbin/gosu && \
chown root:root /usr/local/sbin/gosu && \
chmod 755 /usr/local/sbin/gosu && \
apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \ apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \
ca-certificates \ ca-certificates \
jq \ jq \

4
docker/photoprism/impish/Dockerfile
View File

@ -77,7 +77,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
PHOTOPRISM_AUTO_IMPORT=300 PHOTOPRISM_AUTO_IMPORT=300
# copy dist files and scripts # copy dist files and scripts
COPY --from=build /opt/photoprism/ /opt/photoprism COPY --from=build --chown=root:root --chmod=755 /opt/photoprism/ /opt/photoprism
COPY --chown=root:root --chmod=755 /scripts/dist/* /scripts/ COPY --chown=root:root --chmod=755 /scripts/dist/* /scripts/
# install additional distribution packages # install additional distribution packages
@ -87,8 +87,6 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \
echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \
mv /opt/photoprism/sbin/gosu /usr/local/sbin/gosu && \ mv /opt/photoprism/sbin/gosu /usr/local/sbin/gosu && \
chown root:root /usr/local/sbin/gosu && \
chmod 755 /usr/local/sbin/gosu && \
apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \ apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \
ca-certificates \ ca-certificates \
jq \ jq \

4
docker/photoprism/jammy/Dockerfile
View File

@ -77,7 +77,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
PHOTOPRISM_AUTO_IMPORT=300 PHOTOPRISM_AUTO_IMPORT=300
# copy dist files and scripts # copy dist files and scripts
COPY --from=build /opt/photoprism/ /opt/photoprism COPY --from=build --chown=root:root --chmod=755 /opt/photoprism/ /opt/photoprism
COPY --chown=root:root --chmod=755 /scripts/dist/* /scripts/ COPY --chown=root:root --chmod=755 /scripts/dist/* /scripts/
# install additional distribution packages # install additional distribution packages
@ -87,8 +87,6 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \
echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \
mv /opt/photoprism/sbin/gosu /usr/local/sbin/gosu && \ mv /opt/photoprism/sbin/gosu /usr/local/sbin/gosu && \
chown root:root /usr/local/sbin/gosu && \
chmod 755 /usr/local/sbin/gosu && \
apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \ apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \
ca-certificates \ ca-certificates \
jq \ jq \

6
scripts/dist/entrypoint-init.sh vendored
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# INITIALIZES CONTAINER PACKAGES AND PERMISSIONS # INITIALIZES CONTAINER PACKAGES AND PERMISSIONS
export PATH="/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin:/scripts:$PATH" export PATH="/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin:/scripts"
# abort if not executed as root # abort if not executed as root
if [[ $(id -u) != "0" ]]; then if [[ $(id -u) != "0" ]]; then
@ -17,8 +17,8 @@ case $DOCKER_ENV in
prod) prod)
export PATH="/usr/local/sbin:/usr/sbin:/sbin:/bin:/usr/local/bin:/usr/bin:/scripts:/opt/photoprism/bin"; export PATH="/usr/local/sbin:/usr/sbin:/sbin:/bin:/usr/local/bin:/usr/bin:/scripts:/opt/photoprism/bin";
INIT_SCRIPTS="/scripts" INIT_SCRIPTS="/scripts"
CHOWN_DIRS=("/photoprism" "/opt/photoprism") CHOWN_DIRS=("/photoprism/storage")
CHMOD_DIRS=("/opt/photoprism") CHMOD_DIRS=("/photoprism/storage")
;; ;;
develop) develop)