changed context for build; added chckout to dev in Dockers

Author: rustlluk

.github/workflows/docker.yml

@@ -24,28 +24,28 @@ jobs:
         password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
 
     - name: Build and Push Gitpod Image
+      working-directory: Docker
       uses: docker/build-push-action@v6
       with:
         platforms: linux/amd64
-        context: Docker
         push: true
         file: Dockerfile.gitpod
         tags: rustlluk/pycub:gitpod
 
     - name: Build and Push VNC Image
+      working-directory: Docker
       uses: docker/build-push-action@v6
       with:
         platforms: linux/amd64,linux/arm64
-        context: Docker
         push: true
         file: Dockerfile.vnc
         tags: rustlluk/pycub:vnc
 
     - name: Build and Push Standard Image
+      working-directory: Docker
       uses: docker/build-push-action@v6
       with:
         platforms: linux/amd64,linux/arm64
-        context: Docker
         push: true
         file: Dockerfile
         tags: rustlluk/pycub:latest

Docker/Dockerfile

@@ -57,6 +57,7 @@ RUN echo "export PATH=/usr/local/bin:$PATH" >> /home/docker/.bashrc
 
 # pybullet, robot_description, numpy, etc.
 RUN python$PYTHON_VER -m pip install --user --upgrade pip && python$PYTHON_VER -m pip install pybullet "numpy<2" scipy cython matplotlib roboticstoolbox-python --ignore-installed --verbose --no-cache-dir
+RUN cd /home/docker && git clone https://github.com/rustlluk/pyCub.git && cd pyCub && git checkout dev && python$PYTHON_VER setup.py install --user
 
 # Delete thingies from aptitude
 RUN rm -Rf /var/lib/apt/lists/*

Docker/Dockerfile.gitpod

@@ -92,7 +92,7 @@ RUN echo "export PORT=5901" >> /home/gitpod/.bashrc
 RUN python$PYTHON_VER -m pip install --user --upgrade pip && python$PYTHON_VER -m pip install "numpy<2" cython open3d pybullet roboticstoolbox-python --ignore-installed
 
 USER gitpod
-RUN cd /home/gitpod && git clone https://github.com/rustlluk/pyCub.git && cd pyCub && python$PYTHON_VER setup.py install --user
+RUN cd /home/gitpod && git clone https://github.com/rustlluk/pyCub.git && cd pyCub && git checkout dev && python$PYTHON_VER setup.py install --user
 
 RUN sudo ln -sf /usr/bin/python$PYTHON_VER /usr/local/bin/python && sudo ln -sf /usr/bin/python$PYTHON_VER /usr/local/bin/python3
 RUN echo "export PATH=/usr/local/bin:$PATH" >> /home/gitpod/.bashrc

Docker/Dockerfile.vnc

@@ -99,7 +99,7 @@ RUN echo "export PORT=5999" >> /home/docker/.bashrc
 RUN python$PYTHON_VER -m pip install --user --upgrade pip && python$PYTHON_VER -m pip install "numpy<2" cython open3d pybullet roboticstoolbox-python --ignore-installed
 
 USER docker
-RUN cd /home/docker && git clone https://github.com/rustlluk/pyCub.git && cd pyCub && python$PYTHON_VER setup.py install --user
+RUN cd /home/docker && git clone https://github.com/rustlluk/pyCub.git && cd pyCub && git checkout dev && python$PYTHON_VER setup.py install --user
 
 RUN sudo ln -sf /usr/bin/python$PYTHON_VER /usr/local/bin/python && sudo ln -sf /usr/bin/python$PYTHON_VER /usr/local/bin/python3
 RUN echo "export PATH=/usr/local/bin:$PATH" >> /home/docker/.bashrc