Merge branch 'master' of https://github.com/klakegg/docker-hugo

klakegg · Oct 3, 2022 · 95b4280 · 95b4280
2 parents e45bed5 + 11ff366
commit 95b4280
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -42,6 +42,7 @@ jobs:
           path: target
 
       - name: Test Docsy
+        continue-on-error: true
         run: make test-docsy
 
       - name: Test DocuAPI

diff --git a/README.md b/README.md
@@ -257,7 +257,7 @@ In docker-compose using `entrypoint`:
 | Software | Version |
 | -------- | ------- |
 | Go       | 1.16.2  |
-| NodeJS   | 16.x    |
+| NodeJS   | 18.x    |
 | Pandoc   | 2.12    |
 | Yarn     | 1.22.10 |
 

diff --git a/src/docker/alpine-ext/ext-alpine.df b/src/docker/alpine-ext/ext-alpine.df
@@ -42,7 +42,10 @@ RUN true \
  #
  # Prepare folders
  && mkdir -p /src /target \
- && chmod a+w /src /target
+ && chmod a+w /src /target \
+ #
+ # add /src to safe.directory
+ && git config --global --add safe.directory /src
 
 EXPOSE 1313
 

diff --git a/src/docker/debian-ext/Dockerfile b/src/docker/debian-ext/Dockerfile
@@ -43,7 +43,10 @@ RUN true \
  && rm -rf /var/lib/apt/lists/* \
  && find /tmp -mindepth 1 -maxdepth 1 | xargs rm -rf \
  && mkdir -p /src /target \
- && chmod a+w /src /target
+ && chmod a+w /src /target \
+ #
+ # add /src to safe.directory
+ && git config --global --add safe.directory /src
 
 COPY --from=base--golang / /
 

diff --git a/src/docker/ubuntu-ext/Dockerfile b/src/docker/ubuntu-ext/Dockerfile
@@ -43,7 +43,10 @@ RUN true \
  && rm -rf /var/lib/apt/lists/* \
  && find /tmp -mindepth 1 -maxdepth 1 | xargs rm -rf \
  && mkdir -p /src /target \
- && chmod a+w /src /target
+ && chmod a+w /src /target \
+ #
+ # add /src to safe.directory
+ && git config --global --add safe.directory /src
 
 COPY --from=base--golang / /