summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Colomar <colomar.6.4.3@gmail.com>2020-05-01 08:55:31 +0200
committerAlejandro Colomar <colomar.6.4.3@gmail.com>2020-05-01 08:55:31 +0200
commit6ba26939ef92a46eae95acd525a196f14406079b (patch)
treef8bc4479c3ab1e29904c7f635a06a5d98759e05d
parent938a944544a327cfbce103cd3ccaf8c234f73bcf (diff)
Fix dockerfiles
-rw-r--r--cam/Dockerfile5
-rw-r--r--rob/Dockerfile1
-rw-r--r--rob/robot/ur/Dockerfile1
3 files changed, 5 insertions, 2 deletions
diff --git a/cam/Dockerfile b/cam/Dockerfile
index bd998bb..e8f084e 100644
--- a/cam/Dockerfile
+++ b/cam/Dockerfile
@@ -8,7 +8,9 @@ FROM debian:testing AS build
RUN apt-get update && \
apt-get upgrade -V --yes && \
apt-get install -V \
+ gcc \
gcc-10 \
+ g++ \
g++-10 \
make \
git \
@@ -26,8 +28,7 @@ WORKDIR /tmp
RUN git clone https://github.com/alejandro-colomar/libalx.git && \
make base cv -C libalx -j 8 && \
make install-base install-cv -C libalx
-RUN git clone --single-branch --branch cam \
- https://github.com/alejandro-colomar/rob_cam.git && \
+RUN git clone https://github.com/alejandro-colomar/rob_cam.git && \
make -C rob_cam/cam/ -j 2
FROM debian:testing
diff --git a/rob/Dockerfile b/rob/Dockerfile
index f8aa6df..8bb845e 100644
--- a/rob/Dockerfile
+++ b/rob/Dockerfile
@@ -8,6 +8,7 @@ FROM debian:testing-slim AS build
RUN apt-get update && \
apt-get upgrade -V --yes && \
apt-get install -V \
+ gcc \
gcc-10 \
make \
git \
diff --git a/rob/robot/ur/Dockerfile b/rob/robot/ur/Dockerfile
index 0e11c6a..9b54a89 100644
--- a/rob/robot/ur/Dockerfile
+++ b/rob/robot/ur/Dockerfile
@@ -9,6 +9,7 @@ RUN apt-get update && \
apt-get upgrade -V --yes && \
apt-get install -V \
gcc \
+ gcc-10 \
make \
git \
pkg-config \