almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-05-17 18:51:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

FIXUP: Separate some Dockerfile commands

Browse source
This commit is contained in:
Alex Pyrgiotis 2025-01-14 14:53:31 +02:00
parent 96ab442873
commit cbeb103067
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Dockerfile
View file

@ -52,12 +52,15 @@ RUN mkdir /libreoffice_ext && cd libreoffice_ext \
&& rm /root/.wget-hsts && rm /root/.wget-hsts
# Create an unprivileged user both for gVisor and for running Dangerzone. # Create an unprivileged user both for gVisor and for running Dangerzone.
RUN mkdir -p /opt/dangerzone/dangerzone && \ RUN addgroup --gid 1000 dangerzone
touch /opt/dangerzone/dangerzone/__init__.py && \ RUN adduser --uid 1000 --ingroup dangerzone --shell /bin/true \
addgroup --gid 1000 dangerzone && \
adduser --uid 1000 --ingroup dangerzone --shell /bin/true \
--disabled-password --home /home/dangerzone dangerzone --disabled-password --home /home/dangerzone dangerzone
# Copy Dangerzone's conversion logic under /opt/dangerzone, and allow Python to
# import it.
RUN mkdir -p /opt/dangerzone/dangerzone
RUN touch /opt/dangerzone/dangerzone/__init__.py
COPY conversion/doc_to_pixels.py \ COPY conversion/doc_to_pixels.py \
conversion/common.py \ conversion/common.py \
conversion/errors.py \ conversion/errors.py \

11
Dockerfile.in
View file

@ -52,12 +52,15 @@ RUN mkdir /libreoffice_ext && cd libreoffice_ext \
&& rm /root/.wget-hsts && rm /root/.wget-hsts
# Create an unprivileged user both for gVisor and for running Dangerzone. # Create an unprivileged user both for gVisor and for running Dangerzone.
RUN mkdir -p /opt/dangerzone/dangerzone && \ RUN addgroup --gid 1000 dangerzone
touch /opt/dangerzone/dangerzone/__init__.py && \ RUN adduser --uid 1000 --ingroup dangerzone --shell /bin/true \
addgroup --gid 1000 dangerzone && \
adduser --uid 1000 --ingroup dangerzone --shell /bin/true \
--disabled-password --home /home/dangerzone dangerzone --disabled-password --home /home/dangerzone dangerzone
# Copy Dangerzone's conversion logic under /opt/dangerzone, and allow Python to
# import it.
RUN mkdir -p /opt/dangerzone/dangerzone
RUN touch /opt/dangerzone/dangerzone/__init__.py
COPY conversion/doc_to_pixels.py \ COPY conversion/doc_to_pixels.py \
conversion/common.py \ conversion/common.py \
conversion/errors.py \ conversion/errors.py \