mirror of
https://github.com/Frooodle/Stirling-PDF.git
synced 2025-11-16 01:21:16 +01:00
Merge branch 'main' into pdfa-rework-pdfx
This commit is contained in:
commit
3844d7f56b
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -266,7 +266,7 @@ jobs:
|
|||||||
|
|
||||||
test-build-docker-images:
|
test-build-docker-images:
|
||||||
if: github.event_name == 'pull_request' && needs.files-changed.outputs.project == 'true'
|
if: github.event_name == 'pull_request' && needs.files-changed.outputs.project == 'true'
|
||||||
needs: [files-changed, build, check-generateOpenApiDocs, check-licence]
|
needs: [files-changed, build]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
|
|||||||
@ -39,7 +39,9 @@ ENV DISABLE_ADDITIONAL_FEATURES=true \
|
|||||||
TMP=/tmp/stirling-pdf
|
TMP=/tmp/stirling-pdf
|
||||||
|
|
||||||
# JDK for app
|
# JDK for app
|
||||||
RUN printf '%s\n' \
|
RUN apk add --no-cache bash \
|
||||||
|
&& ln -sf /bin/bash /bin/sh \
|
||||||
|
&& printf '%s\n' \
|
||||||
'https://dl-cdn.alpinelinux.org/alpine/edge/main' \
|
'https://dl-cdn.alpinelinux.org/alpine/edge/main' \
|
||||||
'https://dl-cdn.alpinelinux.org/alpine/edge/community' \
|
'https://dl-cdn.alpinelinux.org/alpine/edge/community' \
|
||||||
'https://dl-cdn.alpinelinux.org/alpine/edge/testing' \
|
'https://dl-cdn.alpinelinux.org/alpine/edge/testing' \
|
||||||
@ -98,7 +100,8 @@ RUN printf '%s\n' \
|
|||||||
# User permissions
|
# User permissions
|
||||||
addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
|
addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
|
||||||
chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /tmp/stirling-pdf && \
|
chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /tmp/stirling-pdf && \
|
||||||
chown stirlingpdfuser:stirlingpdfgroup /app.jar
|
chown stirlingpdfuser:stirlingpdfgroup /app.jar && \
|
||||||
|
ln -sf /bin/busybox /bin/sh
|
||||||
|
|
||||||
EXPOSE 8080/tcp
|
EXPOSE 8080/tcp
|
||||||
|
|
||||||
|
|||||||
@ -53,7 +53,9 @@ ENV DISABLE_ADDITIONAL_FEATURES=true \
|
|||||||
TMP=/tmp/stirling-pdf
|
TMP=/tmp/stirling-pdf
|
||||||
|
|
||||||
# JDK for app
|
# JDK for app
|
||||||
RUN printf '%s\n' \
|
RUN apk add --no-cache bash \
|
||||||
|
&& ln -sf /bin/bash /bin/sh \
|
||||||
|
&& printf '%s\n' \
|
||||||
'https://dl-cdn.alpinelinux.org/alpine/edge/main' \
|
'https://dl-cdn.alpinelinux.org/alpine/edge/main' \
|
||||||
'https://dl-cdn.alpinelinux.org/alpine/edge/community' \
|
'https://dl-cdn.alpinelinux.org/alpine/edge/community' \
|
||||||
'https://dl-cdn.alpinelinux.org/alpine/edge/testing' \
|
'https://dl-cdn.alpinelinux.org/alpine/edge/testing' \
|
||||||
@ -111,7 +113,8 @@ RUN printf '%s\n' \
|
|||||||
# User permissions
|
# User permissions
|
||||||
addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
|
addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
|
||||||
chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /tmp/stirling-pdf && \
|
chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /tmp/stirling-pdf && \
|
||||||
chown stirlingpdfuser:stirlingpdfgroup /app.jar
|
chown stirlingpdfuser:stirlingpdfgroup /app.jar && \
|
||||||
|
ln -sf /bin/busybox /bin/sh
|
||||||
|
|
||||||
EXPOSE 8080/tcp
|
EXPOSE 8080/tcp
|
||||||
# Set user and run command
|
# Set user and run command
|
||||||
|
|||||||
@ -24,7 +24,9 @@ COPY scripts/installFonts.sh /scripts/installFonts.sh
|
|||||||
COPY app/core/build/libs/*.jar app.jar
|
COPY app/core/build/libs/*.jar app.jar
|
||||||
|
|
||||||
# Set up necessary directories and permissions
|
# Set up necessary directories and permissions
|
||||||
RUN printf '%s\n' \
|
RUN apk add --no-cache bash \
|
||||||
|
&& ln -sf /bin/bash /bin/sh \
|
||||||
|
&& printf '%s\n' \
|
||||||
'https://dl-cdn.alpinelinux.org/alpine/edge/main' \
|
'https://dl-cdn.alpinelinux.org/alpine/edge/main' \
|
||||||
'https://dl-cdn.alpinelinux.org/alpine/edge/community' \
|
'https://dl-cdn.alpinelinux.org/alpine/edge/community' \
|
||||||
'https://dl-cdn.alpinelinux.org/alpine/edge/testing' \
|
'https://dl-cdn.alpinelinux.org/alpine/edge/testing' \
|
||||||
@ -44,7 +46,8 @@ RUN printf '%s\n' \
|
|||||||
chmod +x /scripts/*.sh && \
|
chmod +x /scripts/*.sh && \
|
||||||
addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
|
addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
|
||||||
chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /pipeline /configs /customFiles /tmp/stirling-pdf && \
|
chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /pipeline /configs /customFiles /tmp/stirling-pdf && \
|
||||||
chown stirlingpdfuser:stirlingpdfgroup /app.jar
|
chown stirlingpdfuser:stirlingpdfgroup /app.jar && \
|
||||||
|
ln -sf /bin/busybox /bin/sh
|
||||||
|
|
||||||
# Set environment variables
|
# Set environment variables
|
||||||
ENV ENDPOINTS_GROUPS_TO_REMOVE=CLI
|
ENV ENDPOINTS_GROUPS_TO_REMOVE=CLI
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user