summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Colomar <colomar.6.4.3@gmail.com>2020-05-03 02:12:03 +0200
committerAlejandro Colomar <colomar.6.4.3@gmail.com>2020-05-03 02:12:03 +0200
commitfecb8e28d61aff6a0a7262e6e3110a63249a7903 (patch)
tree274cd86cc76cef0d822e3eecd2878084262d8dbc
parent83b46b5f45e253438cd092b74e92a1e4805597aa (diff)
Dockerfile: specify which branch to clone
-rw-r--r--cam/Dockerfile10
-rw-r--r--rob/Dockerfile10
-rw-r--r--rob/robot/ur/Dockerfile10
3 files changed, 24 insertions, 6 deletions
diff --git a/cam/Dockerfile b/cam/Dockerfile
index 66db224..978fc49 100644
--- a/cam/Dockerfile
+++ b/cam/Dockerfile
@@ -26,10 +26,16 @@ RUN apt-get update && \
apt-get autoclean && \
apt-get clean
WORKDIR /tmp
-RUN git clone https://github.com/alejandro-colomar/libalx.git && \
+RUN git clone \
+ --single branch \
+ --branch master \
+ https://github.com/alejandro-colomar/libalx.git && \
make base cv -C libalx -j 8 && \
make install-base install-cv -C libalx
-RUN git clone https://github.com/alejandro-colomar/rob_cam.git && \
+RUN git clone \
+ --single branch \
+ --branch master \
+ https://github.com/alejandro-colomar/rob_cam.git && \
make -C rob_cam/cam/ -j 2
FROM debian@sha256:e6a6f2625ec46aa6ce5c537208565cde16138e7963c341ff2a3ecbf9a6736060
diff --git a/rob/Dockerfile b/rob/Dockerfile
index 42c9010..db24935 100644
--- a/rob/Dockerfile
+++ b/rob/Dockerfile
@@ -22,13 +22,19 @@ RUN apt-get update && \
apt-get autoclean && \
apt-get clean
WORKDIR /tmp
-RUN git clone https://github.com/alejandro-colomar/libalx.git && \
+RUN git clone \
+ --single branch \
+ --branch master \
+ https://github.com/alejandro-colomar/libalx.git && \
make base telnet-tcp robot -C libalx -j 8 && \
make install-base -C libalx && \
make install-telnet-tcp -C libalx && \
make install-robot -C libalx && \
rm -rf libalx
-RUN git clone https://github.com/alejandro-colomar/rob_cam.git && \
+RUN git clone \
+ --single branch \
+ --branch master \
+ https://github.com/alejandro-colomar/rob_cam.git && \
make -C rob_cam/rob/ -j 2
FROM debian@sha256:21a1267db36931b0a89f1fece2e54afa78438951fcaadd529837b7def15d04de
diff --git a/rob/robot/ur/Dockerfile b/rob/robot/ur/Dockerfile
index 3bf2d72..1eb420a 100644
--- a/rob/robot/ur/Dockerfile
+++ b/rob/robot/ur/Dockerfile
@@ -22,13 +22,19 @@ RUN apt-get update && \
apt-get autoclean && \
apt-get clean
WORKDIR /tmp
-RUN git clone https://github.com/alejandro-colomar/libalx.git && \
+RUN git clone \
+ --single branch \
+ --branch master \
+ https://github.com/alejandro-colomar/libalx.git && \
make base telnet-tcp robot -C libalx -j 8 && \
make install-base -C libalx && \
make install-telnet-tcp -C libalx && \
make install-robot -C libalx && \
rm -rf libalx
-RUN git clone https://github.com/alejandro-colomar/rob_cam.git && \
+RUN git clone \
+ --single branch \
+ --branch master \
+ https://github.com/alejandro-colomar/rob_cam.git && \
make -C rob_cam/rob/robot/ur/ -j 2
FROM debian@sha256:e6a6f2625ec46aa6ce5c537208565cde16138e7963c341ff2a3ecbf9a6736060