beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Dockerfiles: Code clean-up

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-03-28 17:44:07 +01:00
parent c98ed8a125
commit ad8d85649d
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
docker/photoprism-arm64/Dockerfile
View file

@ -138,12 +138,12 @@ ENV TF_CPP_MIN_LOG_LEVEL 2
ENV PATH /photoprism/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV PHOTOPRISM_CONFIG_FILE /photoprism/config/photoprism.yml
ENV PHOTOPRISM_ORIGINALS_PATH /photoprism/originals
ENV PHOTOPRISM_IMPORT_PATH /photoprism/import
ENV PHOTOPRISM_EXPORT_PATH /photoprism/export
ENV PHOTOPRISM_ORIGINALS_PATH /photoprism/originals
ENV PHOTOPRISM_DATABASE_PATH /photoprism/database
ENV PHOTOPRISM_CACHE_PATH /photoprism/cache
ENV PHOTOPRISM_CONFIG_FILE /photoprism/config/photoprism.yml
ENV PHOTOPRISM_ASSETS_PATH /photoprism/assets
ENV PHOTOPRISM_RESOURCES_PATH /photoprism/assets/resources
ENV PHOTOPRISM_LOG_FILENAME /photoprism/photoprism.log
@ -155,11 +155,12 @@ COPY --from=build /root/.local/share/photoprism /photoprism/assets
COPY --from=build /root/.config/photoprism /photoprism/config
# Create directories
RUN mkdir -p /photoprism/cache \
/photoprism/database \
RUN mkdir -p \
/photoprism/originals \
/photoprism/import \
/photoprism/export
/photoprism/export \
/photoprism/database \
/photoprism/cache
RUN chmod -R 777 /photoprism

11
docker/photoprism/Dockerfile
View file

@ -54,12 +54,12 @@ ENV TF_CPP_MIN_LOG_LEVEL 2
ENV PATH /photoprism/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV PHOTOPRISM_CONFIG_FILE /photoprism/config/photoprism.yml
ENV PHOTOPRISM_ORIGINALS_PATH /photoprism/originals
ENV PHOTOPRISM_IMPORT_PATH /photoprism/import
ENV PHOTOPRISM_EXPORT_PATH /photoprism/export
ENV PHOTOPRISM_ORIGINALS_PATH /photoprism/originals
ENV PHOTOPRISM_DATABASE_PATH /photoprism/database
ENV PHOTOPRISM_CACHE_PATH /photoprism/cache
ENV PHOTOPRISM_CONFIG_FILE /photoprism/config/photoprism.yml
ENV PHOTOPRISM_ASSETS_PATH /photoprism/assets
ENV PHOTOPRISM_RESOURCES_PATH /photoprism/assets/resources
ENV PHOTOPRISM_LOG_FILENAME /photoprism/photoprism.log
@ -71,11 +71,12 @@ COPY --from=build /root/.local/share/photoprism /photoprism/assets
COPY --from=build /root/.config/photoprism /photoprism/config
# Create directories
RUN mkdir -p /photoprism/cache \
/photoprism/database \
RUN mkdir -p \
/photoprism/originals \
/photoprism/import \
/photoprism/export
/photoprism/export \
/photoprism/database \
/photoprism/cache
RUN chmod -R 777 /photoprism