diff --git a/.dockerignore b/.dockerignore index 5768541c8..fc93d25fe 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,7 @@ * !src* !pyproject.toml +!requirements.txt !Makefile !VERSION !LICENSE diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 25999a199..5d26dd3f0 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -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: diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a06fa895..af7d07bcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/Dockerfile b/Dockerfile index 5fbb4a9a9..9cdb64837 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 .