diff --git a/Makefile b/Makefile index 9b3dacbd1..0f41cae30 100644 --- a/Makefile +++ b/Makefile @@ -24,12 +24,15 @@ start: migrate: go run cmd/photoprism/photoprism.go migrate install-bin: + $(info Building prodution binary...) scripts/build.sh prod /usr/local/bin/$(BINARY_NAME) install-assets: + $(info Installing assets in /srv/photoprism...) + mkdir -p /srv/photoprism/config mkdir -p /srv/photoprism/photos mkdir -p /srv/photoprism/cache - mkdir -p /srv/photoprism/resources - mkdir -p /srv/photoprism/config + mkdir -p /srv/photoprism/resources/database + cp -r assets/resources/static assets/resources/templates assets/resources/nasnet /srv/photoprism/resources rsync -a -v --ignore-existing assets/config/*.yml /srv/photoprism/config find /srv/photoprism -name '.*' -type f -delete dep-js: diff --git a/assets/config/photoprism.yml b/assets/config/photoprism.yml index c27d22f6f..1af83425b 100644 --- a/assets/config/photoprism.yml +++ b/assets/config/photoprism.yml @@ -1,5 +1,4 @@ debug: false -darktable-cli: /usr/bin/darktable-cli assets-path: /srv/photoprism config-path: /srv/photoprism/config resources-path: /srv/photoprism/resources diff --git a/docker/photoprism/Dockerfile b/docker/photoprism/Dockerfile index cdc810a54..cf2e02729 100644 --- a/docker/photoprism/Dockerfile +++ b/docker/photoprism/Dockerfile @@ -10,13 +10,13 @@ RUN make all install # Base base image as photoprism/development FROM ubuntu:18.04 +# Set environment variables ENV DEBIAN_FRONTEND noninteractive +ENV TF_CPP_MIN_LOG_LEVEL 2 +ENV PHOTOPRISM_CONFIG_FILE /srv/photoprism/config/photoprism.yml WORKDIR /srv/photoprism -# Hide TensorFlow warnings -ENV TF_CPP_MIN_LOG_LEVEL 2 - # Install additional distribution packages RUN apt-get update && apt-get install -y --no-install-recommends \ curl \