Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add conda list #49

Merged
merged 15 commits into from
Dec 19, 2020
Merged

Add conda list #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2735ec7
Add conda list
jan-janssen Dec 19, 2020
5b20147
Add conda list
jan-janssen Dec 19, 2020
360ff6e
Add conda list
jan-janssen Dec 19, 2020
b6372f7
Add conda list
jan-janssen Dec 19, 2020
b6fe0bc
Add conda list
jan-janssen Dec 19, 2020
7a2b841
Update Dockerfile
jan-janssen Dec 19, 2020
5862cd3
Update Dockerfile
jan-janssen Dec 19, 2020
c69905f
Update include_notebooks.sh
jan-janssen Dec 19, 2020
c81856d
Update Dockerfile
jan-janssen Dec 19, 2020
f0eb374
Update include_notebooks.sh
jan-janssen Dec 19, 2020
8ff3151
Update Dockerfile
jan-janssen Dec 19, 2020
7d63f88
Update Dockerfile
jan-janssen Dec 19, 2020
915e753
Update Dockerfile
jan-janssen Dec 19, 2020
6b8c65b
Update Dockerfile
jan-janssen Dec 19, 2020
6bea952
Update Dockerfile
jan-janssen Dec 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@ ARG PYTHON_VERSION=default
COPY . ${HOME}/
RUN conda env update -n base -f ${HOME}/environment.yml --prune && \
conda clean --all -f -y && \
npm cache clean --force && \
jlpm cache clean && \
jupyter lab clean && \
rm ${HOME}/environment.yml
conda list

# Fix permissions on /etc/jupyter as root
USER root
Expand Down
3 changes: 2 additions & 1 deletion damask/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ ARG PYTHON_VERSION=default

COPY . ${HOME}/
RUN conda env update -n base -f ${HOME}/environment.yml --prune && \
conda clean --all -f -y
conda clean --all -f -y && \
conda list

USER root
RUN rm ${HOME}/*.ipynb &&\
Expand Down
3 changes: 2 additions & 1 deletion experimental/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ ARG PYTHON_VERSION=default

COPY . ${HOME}/
RUN conda env update -n base -f ${HOME}/environment.yml --prune && \
conda clean --all -f -y
conda clean --all -f -y && \
conda list

USER root
RUN fix-permissions /home/$DOCKER_USER &&\
Expand Down
1 change: 1 addition & 0 deletions experimental/include_notebooks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ cp -r "$HOME"/pyiron_experimental_repo/pyiron_experimental "$HOME"/
rm -r "$HOME"/pyiron_experimental_repo
rm "$HOME"/Dockerfile
rm "$HOME"/*.sh
rm "$HOME"/*.yml
2 changes: 1 addition & 1 deletion md/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN conda env update -n base -f ${HOME}/environment.yml && \
npm cache clean --force && \
jlpm cache clean && \
jupyter lab clean && \
rm ${HOME}/environment.yml
conda list

USER root
RUN fix-permissions /home/$DOCKER_USER &&\
Expand Down
3 changes: 2 additions & 1 deletion pyiron/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ ARG PYTHON_VERSION=default

COPY . ${HOME}/
RUN conda env update -n base -f ${HOME}/environment.yml --prune && \
conda clean --all -f -y
conda clean --all -f -y && \
conda list

USER root
RUN fix-permissions /home/$DOCKER_USER &&\
Expand Down
1 change: 1 addition & 0 deletions pyiron/include_notebooks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ for f in $(cat "$HOME"/exclude); do rm "$HOME"/$f; done;
rm "$HOME"/Dockerfile
rm "$HOME"/exclude
rm "$HOME"/*.sh
rm "$HOME"/*.yml