Skip to content

Commit 67f9253

Browse files
committed
Merge branch 'master' into fix-docker
2 parents ac1d248 + dd4c529 commit 67f9253

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.dockerignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
!src*
33
!pyproject.toml
44
!Makefile
5+
!VERSION
56
!LICENSE
67
!README.md
78
!.git

Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ WORKDIR /build-ocrd
1212

1313
COPY src ./src
1414
COPY pyproject.toml .
15+
COPY VERSION ./VERSION
16+
RUN mv ./src/ocrd_utils/ocrd_logging.conf /etc
1517
COPY Makefile .
1618
COPY README.md .
1719
COPY LICENSE .
1820
COPY .git ./.git
1921

20-
RUN mv ./src/ocrd_utils/ocrd_logging.conf /etc
2122
RUN echo 'APT::Install-Recommends "0"; APT::Install-Suggests "0";' >/etc/apt/apt.conf.d/ocr-d.conf
2223
RUN apt-get update && apt-get -y install software-properties-common \
2324
&& apt-get update && apt-get -y install \

0 commit comments

Comments
 (0)