diff options
| author | Alejandro Colomar <colomar.6.4.3@gmail.com> | 2020-05-03 02:32:26 +0200 |
|---|---|---|
| committer | Alejandro Colomar <colomar.6.4.3@gmail.com> | 2020-05-03 02:32:26 +0200 |
| commit | e562670a44fbed54fb2b5eaa6631e4dcd1c22d2c (patch) | |
| tree | f99c06b771acc15b4c66eb24a71b273570a6d619 | |
| parent | 95a608651c21719558431070543c19b4f584fa3e (diff) | |
Pre-release 0.6v0.6version-0.6
| -rw-r--r-- | cam/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/docker-compose.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/kube-compose.yaml | 6 | ||||
| -rw-r--r-- | rob/Dockerfile | 2 | ||||
| -rw-r--r-- | rob/robot/ur/Dockerfile | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/cam/Dockerfile b/cam/Dockerfile index 7c64bbd..4a9baea 100644 --- a/cam/Dockerfile +++ b/cam/Dockerfile @@ -34,7 +34,7 @@ RUN git clone \ make install-base install-cv -C libalx RUN git clone \ --single-branch \ - --branch master \ + --branch v0.6 \ https://github.com/alejandro-colomar/rob_cam.git && \ make -C rob_cam/cam/ -j 2 diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index effba4d..fad28ee 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -9,7 +9,7 @@ version: "2" services: cam: - image: alejandrocolomar/rob_cam:cam + image: alejandrocolomar/rob_cam:cam_0.6 devices: - "/dev/video0:/dev/video0" environment: @@ -22,7 +22,7 @@ services: restart: always rob: - image: alejandrocolomar/rob_cam:rob + image: alejandrocolomar/rob_cam:rob_0.6 environment: - DELAY_LOGIN=1000000 - DELAY_US=100000 @@ -39,7 +39,7 @@ services: restart: always robot: - image: alejandrocolomar/rob_cam:ur-sim + image: alejandrocolomar/rob_cam:ur-sim_0.6 restart: always ################################################################################ diff --git a/kubernetes/kube-compose.yaml b/kubernetes/kube-compose.yaml index e951c47..e927ae9 100644 --- a/kubernetes/kube-compose.yaml +++ b/kubernetes/kube-compose.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: robot - image: alejandrocolomar/rob_cam:ur-sim + image: alejandrocolomar/rob_cam:ur-sim_0.6 --- apiVersion: apps/v1 kind: Deployment @@ -42,7 +42,7 @@ spec: - sleep 1 containers: - name: rob - image: alejandrocolomar/rob_cam:rob + image: alejandrocolomar/rob_cam:rob_0.6 env: - name: DELAY_LOGIN value: "1000000" @@ -87,7 +87,7 @@ spec: - sleep 2 containers: - name: cam - image: alejandrocolomar/rob_cam:cam + image: alejandrocolomar/rob_cam:cam_0.6 volumeMounts: - name: dev-video0 mountPath: /dev/video0 diff --git a/rob/Dockerfile b/rob/Dockerfile index 81b35ea..c2a1a21 100644 --- a/rob/Dockerfile +++ b/rob/Dockerfile @@ -33,7 +33,7 @@ RUN git clone \ rm -rf libalx RUN git clone \ --single-branch \ - --branch master \ + --branch v0.6 \ https://github.com/alejandro-colomar/rob_cam.git && \ make -C rob_cam/rob/ -j 2 diff --git a/rob/robot/ur/Dockerfile b/rob/robot/ur/Dockerfile index b5eb5b6..91c2aa4 100644 --- a/rob/robot/ur/Dockerfile +++ b/rob/robot/ur/Dockerfile @@ -33,7 +33,7 @@ RUN git clone \ rm -rf libalx RUN git clone \ --single-branch \ - --branch master \ + --branch v0.6 \ https://github.com/alejandro-colomar/rob_cam.git && \ make -C rob_cam/rob/robot/ur/ -j 2 |