Merge remote-tracking branch 'origin/master'

This commit is contained in:
bgamard 2022-02-02 21:18:06 +01:00
commit d8dc63fc98
4 changed files with 40 additions and 10 deletions

View File

@ -3,6 +3,7 @@ name: Maven CI/CD
on: on:
push: push:
branches: [master] branches: [master]
tags: [v*]
workflow_dispatch: workflow_dispatch:
jobs: jobs:
@ -33,24 +34,51 @@ jobs:
needs: [build_and_publish] needs: [build_and_publish]
steps: steps:
- name: Checkout -
name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Download war artifact -
name: Download war artifact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: docs-web-ci.war name: docs-web-ci.war
path: docs-web/target path: docs-web/target
- name: Setup up Docker Buildx -
name: Setup up Docker Buildx
uses: docker/setup-buildx-action@v1 uses: docker/setup-buildx-action@v1
- name: Login to DockerHub -
name: Login to DockerHub
if: github.event_name != 'pull_request'
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push -
name: Populate Docker metadata
id: metadata
uses: docker/metadata-action@v3
with:
images: sismics/docs
flavor: |
latest=false
tags: |
type=ref,event=tag
type=raw,value=latest,enable=${{ github.ref_type != 'tag' }}
labels: |
org.opencontainers.image.title = Teedy
org.opencontainers.image.description = Teedy is an open source, lightweight document management system for individuals and businesses.
org.opencontainers.image.created = ${{ github.event_created_at }}
org.opencontainers.image.author = Sismics
org.opencontainers.image.url = https://teedy.io/
org.opencontainers.image.vendor = Sismics
org.opencontainers.image.license = GPLv2
org.opencontainers.image.version = ${{ github.event_head_commit.id }}
-
name: Build and push
id: docker_build id: docker_build
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
context: . context: .
push: true push: ${{ github.event_name != 'pull_request' }}
tags: sismics/docs:latest tags: ${{ steps.metadata.outputs.tags }}
labels: ${{ steps.metadata.outputs.labels }}

View File

@ -7,6 +7,7 @@ RUN apt-get update && \
mediainfo \ mediainfo \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-ara \ tesseract-ocr-ara \
tesseract-ocr-ces \
tesseract-ocr-chi-sim \ tesseract-ocr-chi-sim \
tesseract-ocr-chi-tra \ tesseract-ocr-chi-tra \
tesseract-ocr-dan \ tesseract-ocr-dan \
@ -39,4 +40,4 @@ RUN rm -f /opt/jetty/lib/mail/javax.mail.glassfish-*.jar
ADD docs.xml /opt/jetty/webapps/docs.xml ADD docs.xml /opt/jetty/webapps/docs.xml
ADD docs-web/target/docs-web-*.war /opt/jetty/webapps/docs.war ADD docs-web/target/docs-web-*.war /opt/jetty/webapps/docs.war
ENV JAVA_OPTIONS -Xmx1g ENV JAVA_OPTIONS -Xmx1g

View File

@ -43,7 +43,7 @@ public class Constants {
/** /**
* Supported document languages. * Supported document languages.
*/ */
public static final List<String> SUPPORTED_LANGUAGES = Lists.newArrayList("eng", "fra", "ita", "deu", "spa", "por", "pol", "rus", "ukr", "ara", "hin", "chi_sim", "chi_tra", "jpn", "tha", "kor", "nld", "tur", "heb", "hun", "fin", "swe", "lav", "dan", "nor", "vie"); public static final List<String> SUPPORTED_LANGUAGES = Lists.newArrayList("eng", "fra", "ita", "deu", "spa", "por", "pol", "rus", "ukr", "ara", "hin", "chi_sim", "chi_tra", "jpn", "tha", "kor", "nld", "tur", "heb", "hun", "fin", "swe", "lav", "dan", "nor", "vie", "ces");
/** /**
* Base URL environment variable. * Base URL environment variable.

View File

@ -545,7 +545,8 @@ angular.module('docs',
{ key: 'lav', label: 'Latviešu' }, { key: 'lav', label: 'Latviešu' },
{ key: 'dan', label: 'Dansk' }, { key: 'dan', label: 'Dansk' },
{ key: 'nor', label: 'Norsk' }, { key: 'nor', label: 'Norsk' },
{ key: 'vie', label: 'Tiếng Việt' } { key: 'vie', label: 'Tiếng Việt' },
{ key: 'ces', label: 'Czech' }
]; ];
}) })
/** /**