Skip to content

Commit 02b6e54

Browse files
lfoppianolfoppiano
authored
Update Grobid to 0.9.0 (#66)
1 parent 4ec5cbd commit 02b6e54

11 files changed

Lines changed: 707 additions & 100 deletions

File tree

‎.github/workflows/ci-build-manual.yml‎

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515

1616
steps:
1717
- uses: actions/checkout@v4
18-
- name: Set up JDK 17
18+
- name: Set up JDK 21
1919
uses: actions/setup-java@v4
2020
with:
21-
java-version: '17.0.10+7'
21+
java-version: '21.0.10+7'
2222
distribution: 'temurin'
2323
cache: 'gradle'
2424
- name: Build with Gradle
@@ -61,22 +61,30 @@ jobs:
6161
pushImage: true
6262
tags: |
6363
latest-develop, ${{ github.event.inputs.custom_tag}}
64-
- name: Image digest
65-
run: echo ${{ steps.docker_build.outputs.digest }}
66-
- name: Docker Image Summary
64+
- name: Job summary
65+
if: always()
66+
env:
67+
IMAGE_FULL_NAME: ${{ steps.docker_build.outputs.imageFullName }}
68+
IMAGE_NAME: ${{ steps.docker_build.outputs.imageName }}
69+
IMAGE_TAGS: ${{ steps.docker_build.outputs.tags }}
70+
IMAGE_DIGEST: ${{ steps.docker_build.outputs.digest }}
6771
run: |
68-
echo "## 🐳 Docker Image Uploaded Successfully" >> $GITHUB_STEP_SUMMARY
69-
echo "" >> $GITHUB_STEP_SUMMARY
70-
echo "**Image Details:**" >> $GITHUB_STEP_SUMMARY
71-
echo "- **Registry:** docker.io" >> $GITHUB_STEP_SUMMARY
72-
echo "- **Image:** lfoppiano/software-mentions" >> $GITHUB_STEP_SUMMARY
73-
echo "- **Type:** CRF-only build" >> $GITHUB_STEP_SUMMARY
74-
echo "- **Tags:**" >> $GITHUB_STEP_SUMMARY
75-
echo " - \`latest-develop\`" >> $GITHUB_STEP_SUMMARY
76-
echo " - \`${{ github.event.inputs.custom_tag }}\`" >> $GITHUB_STEP_SUMMARY
77-
echo "- **Digest:** \`${{ steps.docker_build.outputs.digest }}\`" >> $GITHUB_STEP_SUMMARY
78-
echo "" >> $GITHUB_STEP_SUMMARY
79-
echo "**Usage:**" >> $GITHUB_STEP_SUMMARY
80-
echo "\`\`\`bash" >> $GITHUB_STEP_SUMMARY
81-
echo "docker pull lfoppiano/software-mentions:${{ github.event.inputs.custom_tag }}" >> $GITHUB_STEP_SUMMARY
82-
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
72+
{
73+
if [ -z "$IMAGE_DIGEST" ]; then
74+
echo "_Built but not pushed (pull request)_"
75+
echo ""
76+
fi
77+
echo "## Docker image"
78+
echo ""
79+
echo "| Field | Value |"
80+
echo "|----------|-------|"
81+
echo "| Image | \`$IMAGE_FULL_NAME\` |"
82+
echo "| Tags | \`$IMAGE_TAGS\` |"
83+
echo "| Digest | \`$IMAGE_DIGEST\` |"
84+
echo "| Registry | \`docker.io\` |"
85+
echo ""
86+
echo '```'
87+
echo "docker pull $IMAGE_FULL_NAME"
88+
echo '```'
89+
} >> "$GITHUB_STEP_SUMMARY"
90+

‎.github/workflows/ci-build.yml‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v4
16-
- name: Set up JDK 17
16+
- name: Set up JDK 21
1717
uses: actions/setup-java@v4
1818
with:
19-
java-version: '17.0.10+7'
19+
java-version: '21.0.10+7'
2020
distribution: 'temurin'
2121
cache: 'gradle'
2222
- name: Build with Gradle
@@ -67,5 +67,30 @@ jobs:
6767
registry: docker.io
6868
pushImage: ${{ github.event_name != 'pull_request' }}
6969
tags: latest-develop
70-
- name: Image digest
71-
run: echo ${{ steps.docker_build.outputs.digest }}
70+
- name: Job summary
71+
if: always()
72+
env:
73+
IMAGE_FULL_NAME: ${{ steps.docker_build.outputs.imageFullName }}
74+
IMAGE_NAME: ${{ steps.docker_build.outputs.imageName }}
75+
IMAGE_TAGS: ${{ steps.docker_build.outputs.tags }}
76+
IMAGE_DIGEST: ${{ steps.docker_build.outputs.digest }}
77+
run: |
78+
{
79+
if [ -z "$IMAGE_DIGEST" ]; then
80+
echo "_Built but not pushed (pull request)_"
81+
echo ""
82+
fi
83+
echo "## Docker image"
84+
echo ""
85+
echo "| Field | Value |"
86+
echo "|----------|-------|"
87+
echo "| Image | \`$IMAGE_FULL_NAME\` |"
88+
echo "| Tags | \`$IMAGE_TAGS\` |"
89+
echo "| Digest | \`$IMAGE_DIGEST\` |"
90+
echo "| Registry | \`docker.io\` |"
91+
echo ""
92+
echo '```'
93+
echo "docker pull $IMAGE_FULL_NAME"
94+
echo '```'
95+
} >> "$GITHUB_STEP_SUMMARY"
96+

‎Dockerfile.software‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# build builder image
33
# -------------------
44

5-
FROM eclipse-temurin:17.0.15_6-jdk AS builder
5+
FROM eclipse-temurin:21.0.10_7-jdk AS builder
66

77
USER root
88

@@ -52,7 +52,7 @@ RUN wget https://github.com/kermitt2/Pub2TEI/archive/refs/heads/master.zip && \
5252
# build runtime image
5353
# -------------------
5454

55-
FROM lfoppiano/grobid:0.8.2.1-full AS runtime
55+
FROM lfoppiano/grobid:0.9.0-full AS runtime
5656

5757
# setting locale is likely useless but to be sure
5858
ENV LANG C.UTF-8
@@ -83,7 +83,7 @@ VOLUME ["/opt/grobid/grobid-home/tmp"]
8383

8484
ARG GROBID_VERSION
8585
ENV GROBID_VERSION=${GROBID_VERSION:-latest}
86-
ENV SOFTWARE_MENTIONS_OPTS="-Djava.library.path=/opt/grobid/grobid-home/lib/lin-64:/usr/local/lib/python3.8/dist-packages/jep --add-opens java.base/java.lang=ALL-UNNAMED"
86+
ENV SOFTWARE_MENTIONS_OPTS="-Djava.library.path=/opt/grobid/grobid-home/lib/lin-64:/usr/local/lib/python3.11/dist-packages/jep --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED"
8787

8888
CMD ["./software-mentions/bin/software-mentions", "server", "software-mentions/resources/config/config.yml"]
8989

0 commit comments

Comments
 (0)
⚡