Skip to content

Commit

Permalink
Merge pull request #1173 from OCR-D/fix-docker-requirements
Browse files Browse the repository at this point in the history
Fix docker requirements
  • Loading branch information
kba authored Jan 24, 2024
2 parents a0bbfae + ea1e135 commit 6777ba9
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
*
!src*
!pyproject.toml
!requirements.txt
!Makefile
!VERSION
!LICENSE
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ jobs:
- name: Build the Docker image with GPU support
# default tag uses docker.io, so override on command-line
run: make docker-cuda DOCKER_TAG=${{ env.DOCKER_TAG }}-cuda DOCKER_BASE_IMAGE=${{ env.DOCKER_TAG }}
- name: Smoke Test that ocrd --help works
run: |
docker run --rm -it {{ env.DOCKER_TAG }} ocrd --version
docker run --rm -it {{ env.DOCKER_TAG }}-cuda ocrd --version
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Versioned according to [Semantic Versioning](http://semver.org/).

Fixed:

* deps-cuda: add workaround for tf-keras#62, #1169
* deps-cuda: add workaround for keras-team/tf-keras#62, #1169
* fix regression docker deployment, #1172


Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ WORKDIR /build-ocrd
COPY src ./src
COPY pyproject.toml .
COPY VERSION ./VERSION
COPY requirements.txt ./requirements.txt
RUN mv ./src/ocrd_utils/ocrd_logging.conf /etc
COPY Makefile .
COPY README.md .
Expand Down

0 comments on commit 6777ba9

Please sign in to comment.