Skip to content

Commit 7448efd

Browse files
committed
different source
1 parent c046921 commit 7448efd

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

Dockerfile

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# This file builds a Docker base image for its use in other projects
22

3-
# Copyright (C) 2020-2021 Gergely Padányi-Gulyás (github user fegyi001),
3+
# Copyright (C) 2020-2024 Gergely Padányi-Gulyás (github user fegyi001),
44
# David Frantz
55
# Fabian Lehmann
6+
# Wilfried Weber
67

78
FROM ubuntu:20.04 as builder
89

@@ -37,7 +38,6 @@ apt-get -y install \
3738
libgsl0-dev \
3839
lockfile-progs \
3940
rename \
40-
#parallel \
4141
apt-utils \
4242
cmake \
4343
libgtk2.0-dev \
@@ -52,6 +52,10 @@ apt-get -y install \
5252
libudunits2-dev \
5353
r-base \
5454
aria2 && \
55+
dpkg -r parallel && \
56+
wget http://de.archive.ubuntu.com/ubuntu/pool/universe/p/parallel/parallel_20210822+ds-2_all.deb && \
57+
dpkg -i parallel_20210822+ds-2_all.deb && \
58+
rm parallel_20210822+ds-2_all.deb && \
5559
# Set python aliases for Python 3.x
5660
echo 'alias python=python3' >> ~/.bashrc \
5761
&& echo 'alias pip=pip3' >> ~/.bashrc \
@@ -96,18 +100,8 @@ apt-get clean && rm -r /var/cache/
96100
# Install folder
97101
ENV INSTALL_DIR /opt/install/src
98102

99-
# Build parallel from source
100-
RUN mkdir -p $INSTALL_DIR/parallel && cd $INSTALL_DIR/parallel && \
101-
wget https://ftpmirror.gnu.org/parallel/parallel-20240422.tar.bz2 \
102-
&& tar -xf parallel-20240422.tar.bz2 \
103-
&& cd parallel-20240422 && \
104-
./configure \
105-
&& make \
106-
&& make install \
107-
&& make clean && \
108-
#
109103
# Build OpenCV from source
110-
mkdir -p $INSTALL_DIR/opencv && cd $INSTALL_DIR/opencv && \
104+
RUN mkdir -p $INSTALL_DIR/opencv && cd $INSTALL_DIR/opencv && \
111105
wget https://github.com/opencv/opencv/archive/4.1.0.zip \
112106
&& unzip 4.1.0.zip && \
113107
mkdir -p $INSTALL_DIR/opencv/opencv-4.1.0/build && \

0 commit comments

Comments
 (0)