Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix docker builds #1172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kba merged 2 commits into from
Jan 23, 2024
Merged

fix docker builds #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac1d248
fix docker builds
kba Jan 23, 2024
67f9253
Merge branch 'master' into fix-docker
kba Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*
!ocrd*
!src*
!pyproject.toml
!Makefile
!VERSION
!LICENSE
Expand Down
13 changes: 5 additions & 8 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,16 @@ ENV LANG=C.UTF-8
ENV PIP=pip

WORKDIR /build-ocrd
COPY ocrd ./ocrd
COPY ocrd_modelfactory ./ocrd_modelfactory/
COPY ocrd_models ./ocrd_models
COPY ocrd_utils ./ocrd_utils

COPY src ./src
COPY pyproject.toml .
COPY VERSION ./VERSION
RUN mv ./ocrd_utils/ocrd_logging.conf /etc
COPY ocrd_validators/ ./ocrd_validators
COPY ocrd_network/ ./ocrd_network
RUN mv ./src/ocrd_utils/ocrd_logging.conf /etc
COPY Makefile .
COPY README.md .
COPY LICENSE .
COPY .git ./.git

RUN echo 'APT::Install-Recommends "0"; APT::Install-Suggests "0";' >/etc/apt/apt.conf.d/ocr-d.conf
RUN apt-get update && apt-get -y install software-properties-common \
&& apt-get update && apt-get -y install \
Expand All @@ -37,7 +35,6 @@ RUN apt-get update && apt-get -y install software-properties-common \
&& make deps-ubuntu \
&& python3 -m venv /usr/local \
&& hash -r \
&& pip install --upgrade pip setuptools wheel \
&& make install \
&& eval $FIXUP \
&& rm -rf /build-ocrd
Expand Down