Skip to content

Commit

Permalink
Update dockerfilebuilds (#170)
Browse files Browse the repository at this point in the history
* update dockerfile to grobid to 0.8.0
* update ci-build actions to avoid deprecations
  • Loading branch information
lfoppiano committed Feb 22, 2024
1 parent 721b0f0 commit 128b6fa
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 15 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/ci-build-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 1.17
java-version: '17.0.10+7'
distribution: 'temurin'
cache: 'gradle'
- name: Build with Gradle
run: ./gradlew build -x test

Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build
name: Build unstable

on: [push]

Expand All @@ -12,11 +12,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 1.17
java-version: '17.0.10+7'
distribution: 'temurin'
cache: 'gradle'
- name: Build with Gradle
run: ./gradlew build -x test

Expand All @@ -36,7 +38,7 @@ jobs:
steps:
- name: Create more disk space
run: sudo rm -rf /usr/share/dotnet && sudo rm -rf /opt/ghc && sudo rm -rf "/usr/local/share/boost" && sudo rm -rf "$AGENT_TOOLSDIRECTORY"
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Build and push
id: docker_build
uses: mr-smithers-excellent/docker-build-push@v5
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 1.17
java-version: '17.0.10+7'
distribution: 'temurin'
cache: 'gradle'
- name: Build with Gradle
run: ./gradlew build -x test

Expand All @@ -39,6 +41,8 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Create more disk space
run: sudo rm -rf /usr/share/dotnet && sudo rm -rf /opt/ghc && sudo rm -rf "/usr/local/share/boost" && sudo rm -rf "$AGENT_TOOLSDIRECTORY"
- name: Set tags
id: set_tags
run: |
Expand All @@ -54,11 +58,12 @@ jobs:
fi
echo "TAGS=${TAGS}"
echo ::set-output name=tags::${TAGS}
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Build and push
id: docker_build
uses: mr-smithers-excellent/docker-build-push@v5
with:
dockerfile: Dockerfile.local
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
image: lfoppiano/grobid-quantities
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ WORKDIR /opt
# build runtime image
# -------------------

FROM grobid/grobid:0.7.3 as runtime

FROM grobid/grobid:0.8.0 as runtime

# setting locale is likely useless but to be sure
ENV LANG C.UTF-8
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.local
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ WORKDIR /opt
# build runtime image
# -------------------

FROM grobid/grobid:0.7.3 as runtime
FROM grobid/grobid:0.8.0 as runtime

# setting locale is likely useless but to be sure
ENV LANG C.UTF-8
Expand Down

0 comments on commit 128b6fa

Please sign in to comment.