Skip to content

Commit 5efc058

Browse files
committed
Fixed deploy.py mistake; mistake in Dockerfile
1 parent c5f55ec commit 5efc058

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Docker/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ RUN cd /opt && wget https://download.jetbrains.com/python/pycharm-community-$PYC
4040
tar -xvf pycharm-community-$PYCHARM_VER.tar.gz && rm pycharm-community-$PYCHARM_VER.tar.gz && \
4141
mv pycharm-community-$PYCHARM_VER pycharm && ln -s /opt/pycharm/bin/pycharm.sh /usr/bin/pycharm && chmod +x /usr/bin/pycharm
4242

43-
4443
RUN apt remove python3-psutil -y
4544
RUN python$PYTHON_VER -m pip install --upgrade pip && python$PYTHON_VER -m pip install "numpy<2" cython psutil open3d pybullet roboticstoolbox-python --ignore-installed --no-cache-dir
4645

@@ -61,10 +60,11 @@ RUN groupadd -g $GID docker_users && useradd -l -u $UID -G $GID -md /home/docker
6160
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
6261
RUN echo "export PATH=/usr/local/bin:$PATH" >> /home/docker/.bashrc
6362

63+
USER docker
6464
RUN cd /home/docker && git clone https://github.com/rustlluk/pyCub.git && cd pyCub && git checkout dev && python$PYTHON_VER setup.py install --user
6565

6666
# Delete thingies from aptitude
67-
RUN rm -Rf /var/lib/apt/lists/*
67+
RUN sudo rm -Rf /var/lib/apt/lists/*
6868

6969
WORKDIR /home/docker
7070
ENTRYPOINT sudo service ssh start >> /dev/null && /bin/bash

Docker/deploy.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ def main():
194194
call(cmd, shell=True, stderr=PIPE, stdout=PIPE)
195195

196196
if not vnc:
197-
cmd = (f'docker run -it "-u $(id -u):$(id -g) -e DISPLAY -e "QT_X11_NO_MITSHM=1" -e "XAUTHORITY=/tmp/.docker.xauth" '
197+
cmd = (f'docker run -it -u $(id -u):$(id -g) -e "DISPLAY" -e "QT_X11_NO_MITSHM=1" -e "XAUTHORITY=/tmp/.docker.xauth" '
198198
f'-v /tmp/.docker.xauth:/tmp/.docker.xauth:rw -v "/tmp/.X11-unix:/tmp/.X11-unix:rw" -v /dev:/dev '
199199
f'-v /etc/hosts:/etc/hosts --network host --privileged --name {container} -v {path}:/home/docker/pycub_ws {image}')
200200
else:

0 commit comments

Comments
 (0)