diff options
| author | Alejandro Colomar <colomar.6.4.3@gmail.com> | 2020-05-29 13:15:00 +0200 |
|---|---|---|
| committer | Alejandro Colomar <colomar.6.4.3@gmail.com> | 2020-05-29 13:15:00 +0200 |
| commit | 751bc92a6792355e6afafdfb3530511bdfdaa6d2 (patch) | |
| tree | 1f8f55789f84b62258867cd0becdefea78121460 | |
| parent | 56ee4f61e231293955658077c927b900e3604681 (diff) | |
Fix paths
| -rw-r--r-- | etc/docker/cam/Dockerfile | 2 | ||||
| -rw-r--r-- | etc/docker/rob/Dockerfile | 4 | ||||
| -rw-r--r-- | etc/docker/robot/ur-sim/Dockerfile | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/etc/docker/cam/Dockerfile b/etc/docker/cam/Dockerfile index 25952cd..b0a4c1f 100644 --- a/etc/docker/cam/Dockerfile +++ b/etc/docker/cam/Dockerfile @@ -37,7 +37,7 @@ RUN git clone \ --single-branch \ --branch version-0.5 \ https://github.com/alejandro-colomar/rob_cam.git && \ - make bin/cam + make bin/cam -C rob_cam ## debian:bullseye FROM debian@sha256:a0304760ee6dbca1270ddb92a850b5328057618edd9658cac3e4c913ce38dae1 diff --git a/etc/docker/rob/Dockerfile b/etc/docker/rob/Dockerfile index beca7dd..68be2eb 100644 --- a/etc/docker/rob/Dockerfile +++ b/etc/docker/rob/Dockerfile @@ -35,7 +35,7 @@ RUN git clone \ --single-branch \ --branch version-0.5 \ https://github.com/alejandro-colomar/rob_cam.git && \ - make bin/rob -j 2 + make bin/rob -C rob_cam ## debian:latest FROM debian@sha256:18f374fa88f9230a5c860f986dc83d3d03a056708164ff30c98d0e789e90946d @@ -47,7 +47,7 @@ RUN apt-get update && \ apt-get autoremove --purge --yes && \ apt-get autoclean && \ apt-get clean -COPY --from=build /tmp/rob_cam/rob/rob /usr/local/bin/rob +COPY --from=build /tmp/rob_cam/bin/rob /usr/local/bin/rob CMD ["rob"] # docker container run --tty --interactive --rm --name rob --network rob_cam_network --env ROBOT_TYPE=ur --env ROBOT_ADDR=robot --env ROBOT_PORT=30002 --env ROBOT_USER= --env ROBOT_PASSWD= --env ROBOT_STATUS_FNAME=status.log --env ROB_PORT=13100 --env ROB_CAMS_MAX=10 --env DELAY_LOGIN=1000000 --env DELAY_US=100000 alejandrocolomar/rob_cam:rob_0.5.6 diff --git a/etc/docker/robot/ur-sim/Dockerfile b/etc/docker/robot/ur-sim/Dockerfile index b598f34..89c9c6b 100644 --- a/etc/docker/robot/ur-sim/Dockerfile +++ b/etc/docker/robot/ur-sim/Dockerfile @@ -36,7 +36,7 @@ RUN git clone \ --single-branch \ --branch version-0.5 \ https://github.com/alejandro-colomar/rob_cam.git && \ - make bin/ur-sim -j 2 + make bin/ur-sim -C rob_cam ## debian:bullseye FROM debian@sha256:a0304760ee6dbca1270ddb92a850b5328057618edd9658cac3e4c913ce38dae1 @@ -48,7 +48,7 @@ RUN apt-get update && \ apt-get autoremove --purge --yes && \ apt-get autoclean && \ apt-get clean -COPY --from=build /tmp/rob_cam/rob/robot/ur/ur-sim /usr/local/bin/ur-sim +COPY --from=build /tmp/rob_cam/bin/ur-sim /usr/local/bin/ur-sim CMD ["ur-sim"] # docker container run --tty --network rob_cam_network --name robot --rm alejandrocolomar/rob_cam:ur-sim_0.5.6 |