diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 25a55610..cbb05a70 100644 --- 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 index a673dc10..91ab2370 100644 --- 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 index 919de74b..0ab860d2 100644 --- 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 index d8570f61..52949311 100644 --- 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 index 3d566022..c96aef78 100644 --- 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 / /