Skip to content

Commit cfab691

Browse files
committed
fixed dockefiles
1 parent 49f2a80 commit cfab691

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

.github/workflows/docker.yml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Build and Push Docker Image to correct tags
33
on:
44
push:
55
branches:
6+
- master
67
- dev
78

89
jobs:

Docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RUN sudo ln -sf /usr/bin/python$PYTHON_VER /usr/local/bin/python && sudo ln -sf
6161
RUN echo "export PATH=/usr/local/bin:$PATH" >> /home/docker/.bashrc
6262

6363
USER docker
64-
RUN cd /home/docker && git clone https://github.com/rustlluk/pyCub.git && cd pyCub && python$PYTHON_VER pip install . --no-cache-dir && \
64+
RUN cd /home/docker && git clone https://github.com/rustlluk/pyCub.git && cd pyCub && python$PYTHON_VER pip install . && \
6565
cd /home/docker && rm -Rf pyCub
6666

6767
# Delete thingies from aptitude

Docker/Dockerfile.gitpod

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ COPY ["additional_files/PyCharm.desktop", "/home/gitpod/Desktop/PyCharm.desktop"
9494

9595
RUN sudo chown gitpod:gitpod "/home/gitpod/Desktop/PyCharm.desktop" && chmod +x "/home/gitpod/Desktop/PyCharm.desktop"
9696

97-
RUN cd /home/docker && git clone https://github.com/rustlluk/pyCub.git && cd pyCub && python$PYTHON_VER pip install . --no-cache-dir && \
97+
RUN cd /home/docker && git clone https://github.com/rustlluk/pyCub.git && cd pyCub && python$PYTHON_VER pip install . && \
9898
cd /home/docker && rm -Rf pyCub
9999

100100
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

Docker/Dockerfile.vnc

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ RUN sudo chown docker:docker "/home/docker/Desktop/Visual Studio Code.desktop" &
9494
COPY ["additional_files/PyCharm.desktop", "/home/docker/Desktop/PyCharm.desktop"]
9595
RUN sudo chown docker:docker "/home/docker/Desktop/PyCharm.desktop" && chmod +x "/home/docker/Desktop/PyCharm.desktop"
9696

97-
RUN cd /home/docker && git clone https://github.com/rustlluk/pyCub.git && cd pyCub && python$PYTHON_VER pip install . --no-cache-dir && \
97+
RUN cd /home/docker && git clone https://github.com/rustlluk/pyCub.git && cd pyCub && python$PYTHON_VER pip install . && \
9898
cd /home/docker && rm -Rf pyCub
9999

100100
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

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
setup(
3131
name=app_name,
32-
version="1.0.2",
32+
version="1.0.3",
3333
description="pyCub - iCub in PyBullet",
3434
package_dir={"": "."},
3535
data_files=files_to_copy,
@@ -42,7 +42,7 @@
4242
classifiers=[
4343
# While there is no official classifier for CC BY 4.0 in the PyPI list,
4444
# you can include a custom classifier or use a more generic one.
45-
"License :: Creative Commons Attribution 4.0 International (CC BY 4.0)",
45+
"License :: Other/Proprietary License",
4646
"Programming Language :: Python :: 3",
4747
"Operating System :: OS Independent",
4848
],

0 commit comments

Comments
 (0)