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

Docker: Set explicit /photoprism directory permissions #1301

Browse source
This commit is contained in:
Michael Mayer 2021-05-20 09:15:40 +02:00
parent 156f1fb959
commit a0f3ab5622
5 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -1,4 +1,4 @@
FROM photoprism/development:20210519
FROM photoprism/development:20210520
# Set up project directory
WORKDIR "/go/src/github.com/photoprism/photoprism"

4
docker/development/Dockerfile
View file

@ -134,8 +134,8 @@ RUN env GO111MODULE=off /usr/local/go/bin/go get -u github.com/psampaz/go-mod-ou
cp /go/bin/gosu /bin/gosu
# Create photoprism user and directory for deployment
RUN useradd photoprism -m -d /photoprism && \
mkdir -p /var/lib/photoprism /tmp/photoprism && \
RUN useradd photoprism -m -d /photoprism && chmod a+rwx /photoprism && \
mkdir -m 777 -p /var/lib/photoprism /tmp/photoprism && \
echo "alias go=richgo" > /photoprism/.bash_aliases && \
echo "photoprism ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
chown -Rf photoprism:photoprism /photoprism /var/lib/photoprism /tmp/photoprism && \

9
docker/photoprism/Dockerfile
View file

@ -1,4 +1,4 @@
FROM photoprism/development:20210519 as build
FROM photoprism/development:20210520 as build
# Set up project directory
WORKDIR "/go/src/github.com/photoprism/photoprism"
@ -105,7 +105,7 @@ COPY --from=build /usr/lib/libtensorflow_framework.so /usr/lib/libtensorflow_fra
RUN ldconfig
# Set default umask and create photoprism user
RUN umask 0000 && useradd photoprism -m -d /photoprism
RUN umask 0000 && useradd photoprism -m -d /photoprism && chmod a+rwx /photoprism
WORKDIR /photoprism
# Copy files to /photoprism
@ -114,7 +114,7 @@ COPY --from=build /root/.photoprism/assets /photoprism/assets
COPY --chown=root:root --chmod=755 /docker/scripts/heif-convert.sh /usr/local/bin/heif-convert
# Create directories
RUN mkdir -p \
RUN mkdir -m 777 -p \
/var/lib/photoprism \
/tmp/photoprism \
/photoprism/originals \
@ -122,7 +122,8 @@ RUN mkdir -p \
/photoprism/storage/config \
/photoprism/storage/cache && \
chown -Rf photoprism:photoprism /photoprism /var/lib/photoprism /tmp/photoprism && \
chmod -Rf a+rw /photoprism /var/lib/photoprism /tmp/photoprism
chmod -Rf a+rw /photoprism /var/lib/photoprism /tmp/photoprism && \
find /photoprism -type d -print0 | xargs -0 chmod 777
# Show photoprism version
RUN photoprism -v

7
docker/photoprism/arm32/Dockerfile
View file

@ -200,7 +200,7 @@ COPY --chown=root:root --chmod=755 /docker/scripts/heif-convert.sh /usr/local/bi
RUN ldconfig
# Set default umask and create photoprism user
RUN umask 0000 && useradd photoprism -m -d /photoprism
RUN umask 0000 && useradd photoprism -m -d /photoprism && chmod a+rwx /photoprism
WORKDIR /photoprism
# Copy files to /photoprism
@ -208,7 +208,7 @@ COPY --from=build /root/.local/bin/photoprism /photoprism/bin/photoprism
COPY --from=build /root/.photoprism/assets /photoprism/assets
# Create directories
RUN mkdir -p \
RUN mkdir -m 777 -p \
/var/lib/photoprism \
/tmp/photoprism \
/photoprism/originals \
@ -216,7 +216,8 @@ RUN mkdir -p \
/photoprism/storage/config \
/photoprism/storage/cache && \
chown -Rf photoprism:photoprism /photoprism /var/lib/photoprism /tmp/photoprism && \
chmod -Rf a+rw /photoprism /var/lib/photoprism /tmp/photoprism
chmod -Rf a+rw /photoprism /var/lib/photoprism /tmp/photoprism && \
find /photoprism -type d -print0 | xargs -0 chmod 777
# Show photoprism version
RUN photoprism -v

7
docker/photoprism/arm64/Dockerfile
View file

@ -199,7 +199,7 @@ COPY --chown=root:root --chmod=755 /docker/scripts/heif-convert.sh /usr/local/bi
RUN ldconfig
# Set default umask and create photoprism user
RUN umask 0000 && useradd photoprism -m -d /photoprism
RUN umask 0000 && useradd photoprism -m -d /photoprism && chmod a+rwx /photoprism
WORKDIR /photoprism
# Copy files to /photoprism
@ -207,7 +207,7 @@ COPY --from=build /root/.local/bin/photoprism /photoprism/bin/photoprism
COPY --from=build /root/.photoprism/assets /photoprism/assets
# Create directories
RUN mkdir -p \
RUN mkdir -m 777 -p \
/var/lib/photoprism \
/tmp/photoprism \
/photoprism/originals \
@ -215,7 +215,8 @@ RUN mkdir -p \
/photoprism/storage/config \
/photoprism/storage/cache && \
chown -Rf photoprism:photoprism /photoprism /var/lib/photoprism /tmp/photoprism && \
chmod -Rf a+rw /photoprism /var/lib/photoprism /tmp/photoprism
chmod -Rf a+rw /photoprism /var/lib/photoprism /tmp/photoprism && \
find /photoprism -type d -print0 | xargs -0 chmod 777
# Show photoprism version
RUN photoprism -v