diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml index d0d8d165..4ef18b08 100644 --- a/.github/workflows/push-docker.yml +++ b/.github/workflows/push-docker.yml @@ -56,6 +56,17 @@ jobs: tags: | ${{ steps.versionNumber.outputs.versionNumber }}${{ github.ref == 'refs/heads/main' && '-alpha' || '' }} + - name: Generate tags 2 + id: meta2 + if: github.ref == 'refs/heads/master' + uses: docker/metadata-action@v4.4.0 + with: + images: | + ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf + ghcr.io/${{ github.repository_owner }}/s-pdf + tags: latest + + - name: Set up QEMU uses: docker/setup-qemu-action@v2.1.0 diff --git a/Dockerfile b/Dockerfile index 50bbc809..fbd71f5f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,8 +17,6 @@ ENV APP_HOME_NAME="Stirling PDF" #ENV APP_NAVBAR_NAME="Stirling PDF" # Run the application +RUN chmod +x /scripts/init.sh ENTRYPOINT ["/scripts/init.sh"] CMD ["java", "-jar", "/app.jar"] - - - diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties index 26e958ae..6ac9683c 100644 --- a/src/main/resources/messages_en_GB.properties +++ b/src/main/resources/messages_en_GB.properties @@ -143,7 +143,7 @@ ocr.selectText.2=Produce text file containing OCR text alongside the OCR'ed PDF ocr.selectText.3=Correct pages were scanned at a skewed angle by rotating them back into place ocr.selectText.4=Clean page so its less likely that OCR will find text in background noise. (No output change) ocr.selectText.5=Clean page so its less likely that OCR will find text in background noise, maintains cleanup in output. -ocr.selectText.6=Ignores pages that have interacive text on them, only OCRs pages that are images +ocr.selectText.6=Ignores pages that have interactive text on them, only OCRs pages that are images ocr.selectText.7=Force OCR, will OCR Every page removing all original text elements ocr.selectText.8=Normal (Will error if PDF contains text) ocr.selectText.9=Additional Settings