fix permission issues (#175)

floryn90 · Nov 16, 2024 · db2f7ea · db2f7ea
2 parents fe8b1ce + b0606ab
commit db2f7ea
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 1 deletion.
diff --git a/src/docker/_imports/ci.df b/src/docker/_imports/ci.df
@@ -1,6 +1,7 @@
 FROM main AS ci
 
 ENV HUGO_ENV="production"
+RUN chown -R hugo:hugo /src /target
 USER hugo
 ENTRYPOINT [ "" ]
 CMD [ "hugo" ]
diff --git a/src/docker/_imports/onbuild.df b/src/docker/_imports/onbuild.df
@@ -12,7 +12,7 @@ ONBUILD ENV HUGO_DESTINATION="${HUGO_DESTINATION_ARG:-/target}" \
 
 ONBUILD COPY . /src
 ONBUILD WORKDIR ${HUGO_DIR:-/src}
-
+ONBUILD RUN chown -R hugoȘhugo /src /target
 ONBUILD USER hugo
 
 ONBUILD RUN if [ -e "$ONBUILD_SCRIPT_VALUE" ]; then exec sh $ONBUILD_SCRIPT_VALUE; else exec hugo $HUGO_CMD; fi
diff --git a/src/docker/alpine-ext/ext-alpine.df b/src/docker/alpine-ext/ext-alpine.df
@@ -52,6 +52,8 @@ RUN true \
  # add /src to safe.directory
  && git config --global --add safe.directory /src
 
+VOLUME [ "/src", "/target" ]
+
 EXPOSE 1313
 
 WORKDIR /src

diff --git a/src/docker/alpine-ext/ext-asciidoctor.df b/src/docker/alpine-ext/ext-asciidoctor.df
@@ -11,6 +11,7 @@ RUN apk -U upgrade && apk --no-cache add asciidoctor \
  && chown -R hugo:hugo /src /target \
  && chmod -R a+rwx /src /target
 
+ VOLUME [ "/src", "/target" ]
 
 IMPORT ../_imports/ci.df
 

diff --git a/src/docker/alpine-ext/ext-pandoc.df b/src/docker/alpine-ext/ext-pandoc.df
@@ -1,5 +1,7 @@
 FROM ext-alpine AS main
 
+VOLUME [ "/src", "/target" ]
+
 COPY --from=base--pandoc / /
 
 IMPORT ../_imports/default_nonroot_user_alpine.df

diff --git a/src/docker/alpine/alpine.df b/src/docker/alpine/alpine.df
@@ -24,6 +24,9 @@ RUN apk -U upgrade && apk --no-cache add busybox-suid bash bash-completion tzdat
  && chown -R hugo:hugo /src /target \
  && chmod a+rwx /src /target 
 
+VOLUME [ "/src", "/target" ]
+
+
 EXPOSE 1313
 WORKDIR /src
 ENTRYPOINT ["hugo"]

diff --git a/src/docker/alpine/asciidoctor.df b/src/docker/alpine/asciidoctor.df
@@ -5,6 +5,9 @@ RUN apk -U upgrade && apk --no-cache add asciidoctor \
  && gem install coderay asciidoctor-rouge --no-document \
  && find /tmp -mindepth 1 -maxdepth 1 | xargs rm -rf
 
+VOLUME [ "/src", "/target" ]
+
+
 IMPORT ../_imports/ci.df
 
 IMPORT ../_imports/onbuild.df

diff --git a/src/docker/alpine/pandoc.df b/src/docker/alpine/pandoc.df
@@ -6,6 +6,8 @@ COPY --from=base--pandoc / /
 
 IMPORT ../_imports/default_nonroot_user_alpine.df
 
+VOLUME [ "/src", "/target" ]
+
 IMPORT ../_imports/ci.df
 
 IMPORT ../_imports/onbuild.df

diff --git a/src/docker/busybox/Dockerfile b/src/docker/busybox/Dockerfile
@@ -24,6 +24,8 @@ RUN mkdir -p /src /target \
  && chown -R hugo:hugo /src /target \
  && chmod a+wrx /src /target
 
+VOLUME [ "/src", "/target" ]
+
 EXPOSE 1313
 
 WORKDIR /src

diff --git a/src/docker/debian-ext/Dockerfile b/src/docker/debian-ext/Dockerfile
@@ -63,6 +63,8 @@ RUN true \
 
 COPY --from=base--golang / /
 
+VOLUME [ "/src", "/target" ]
+
 IMPORT ../_imports/ci.df
 
 IMPORT ../_imports/onbuild.df

diff --git a/src/docker/debian/base.df b/src/docker/debian/base.df
@@ -20,6 +20,8 @@ RUN apt update \
 
 COPY --from=base--files--debian / /
 
+VOLUME [ "/src", "/target" ]
+
 EXPOSE 1313
 WORKDIR /src
 USER hugo

diff --git a/src/docker/debian/debian.df b/src/docker/debian/debian.df
@@ -10,6 +10,8 @@ IMPORT ../_imports/ci.df
 
 IMPORT ../_imports/onbuild.df
 
+VOLUME [ "/src", "/target" ]
+
 FROM main
 
 USER hugo
diff --git a/src/docker/ubuntu-ext/Dockerfile b/src/docker/ubuntu-ext/Dockerfile
@@ -64,6 +64,8 @@ RUN true \
 
 COPY --from=base--golang / /
 
+VOLUME [ "/src", "/target" ]
+
 IMPORT ../_imports/ci.df
 
 IMPORT ../_imports/onbuild.df

diff --git a/src/docker/ubuntu/base.df b/src/docker/ubuntu/base.df
@@ -22,6 +22,8 @@ RUN apt update \
  && chown -R hugo:hugo /src /target \
  && chmod a+wrx /src /target 
 
+VOLUME [ "/src", "/target" ]
+
 EXPOSE 1313
 WORKDIR /src
 

diff --git a/src/docker/ubuntu/ubuntu.df b/src/docker/ubuntu/ubuntu.df
@@ -10,6 +10,8 @@ IMPORT ../_imports/ci.df
 
 IMPORT ../_imports/onbuild.df
 
+VOLUME [ "/src", "/target" ]
+
 FROM main
 
 USER hugo