Skip to content

Commit c8abc7c

Browse files
committed
Dockerfiles updates; v1.0.3 of setup
1 parent 9c0c2cf commit c8abc7c

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

.github/workflows/docker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ jobs:
4848
context: ./Docker
4949
push: true
5050
file: ./Docker/Dockerfile
51-
tags: rustlluk/pycub:latest
51+
tags: rustlluk/pycub:latest

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ 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 && \
98-
cd /home/docker && rm -Rf pyCub
97+
RUN cd /home/gitpod && git clone https://github.com/rustlluk/pyCub.git && cd pyCub && python$PYTHON_VER pip install . && \
98+
cd /home/gitpod && 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
101101
RUN echo "export PATH=/usr/local/bin:$PATH" >> /home/gitpod/.bashrc

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@
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,
3636
install_requires=install_requires,
3737
author="Lukas Rustler",
3838
author_email="[email protected]",
3939
url="https://www.lukasrustler.cz/pycub",
40+
license="Creative Commons Attribution 4.0 International (CC BY 4.0)",
4041
license_files="LICENSE", # Include the LICENSE file in the distribution
4142
classifiers=[
4243
# While there is no official classifier for CC BY 4.0 in the PyPI list,
@@ -49,4 +50,4 @@
4950
long_description_content_type="text/markdown", # Specify Markdown format
5051
platforms=["any"],
5152
python_requires=">=3.8, <=3.11"
52-
)
53+
)

0 commit comments

Comments
 (0)