Skip to content

Commit 33d4638

Browse files
fix Dockerfile (#179): copy ppocr and remove submodule
1 parent 079542a commit 33d4638

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

Dockerfile

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM ubuntu:latest
22
# Install build dependencies
33
RUN apt-get -qq update && apt-get install -y g++ libboost-tools-dev libssl-dev libkrb5-dev \
4-
libgssglue-dev libsnappy-dev libpng-dev libbz2-dev libhyperscan-dev git python3 gettext
4+
libgssglue-dev libsnappy-dev libpng-dev libbz2-dev libhyperscan-dev python3 gettext
55
# Create build directory
66
RUN mkdir -p /gcc/
77
# Set container working directory
@@ -10,15 +10,12 @@ WORKDIR /gcc/
1010
COPY Jamroot targets.jam /gcc/
1111
COPY jam /gcc/jam
1212
COPY projects/ocr1 /gcc/projects/ocr1
13+
COPY projects/ppocr /gcc/projects/ppocr
1314
COPY projects/redemption_configs /gcc/projects/redemption_configs
1415
COPY tools/i18n /gcc/tools/i18n
1516
COPY src /gcc/src
1617
COPY include /gcc/include
1718
COPY sys /gcc/sys
18-
# Clone ppocr repository; could be replaced with `git submodule update --init` but
19-
# if this runs from another git repository (a fork for example) the owner of the
20-
# fork must ensure they also fork ppocr and make sure that ../ppocr leads to the proper git repository
21-
RUN mkdir -p modules && cd modules && git clone https://github.com/wallix/ppocr.git ppocr
2219
# Build and install rdpproxy
2320
RUN bjam linkflags=-static-libstdc++ variant=release -q --toolset=gcc \
2421
cxxflags='-DREDEMPTION_DISABLE_NO_BOOST_PREPROCESSOR_WARNING' cxx-lto=on \

0 commit comments

Comments
 (0)