diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 937ab2b4a0a3f14bf13fd6aee90b10bd301b19c9..1d16d2e5ccacc3cbc4781762345016c59bf2d6e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,10 +37,10 @@ build-binder: # Use Binder build API to trigger repo2docker to build image on GKE and OVH Binder Federation clusters - ls - apk update && apk add curl - - chmod +x .gitlab-ci_trigger-binder.sh - - .gitlab-ci_trigger-binder.sh https://mybinder.org/build/git/https%3A%2F%2Fgit.rwth-aachen.de%2FIENT%2Fjupyter-quickstart/master - - .gitlab-ci_trigger-binder.sh https://gke.mybinder.org/build/git/https%3A%2F%2Fgit.rwth-aachen.de%2FIENT%2Fjupyter-quickstart/master - - .gitlab-ci_trigger-binder.sh https://ovh.mybinder.org/build/git/https%3A%2F%2Fgit.rwth-aachen.de%2FIENT%2Fjupyter-quickstart/master + - chmod +x binder/trigger-binder.sh + - binder/trigger-binder.sh https://mybinder.org/build/git/https%3A%2F%2Fgit.rwth-aachen.de%2FIENT%2Fjupyter-quickstart/master + - binder/trigger-binder.sh https://gke.mybinder.org/build/git/https%3A%2F%2Fgit.rwth-aachen.de%2FIENT%2Fjupyter-quickstart/master + - binder/trigger-binder.sh https://ovh.mybinder.org/build/git/https%3A%2F%2Fgit.rwth-aachen.de%2FIENT%2Fjupyter-quickstart/master - ls only: - master @@ -66,4 +66,4 @@ release-docker: - master only: changes: - - Dockerfile \ No newline at end of file + - Dockerfile diff --git a/Dockerfile b/Dockerfile index ab459ddd1d4561dcf10aaa8c66192e7e1c88d78a..4b40d29b0eedaa0f28ba57c3ed65a7c56ad57ff1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN conda env update -f /tmp/environment.yml RUN conda clean --all -f -y # install some extensions defined in binder postBuild -ADD postBuild /tmp/postBuild.sh +ADD binder/postBuild /tmp/postBuild.sh USER root RUN chmod +x /tmp/postBuild.sh USER $NB_USER diff --git a/README.md b/README.md index 695bc42b65247053e8628cac3e32334931f8ecd8..6a749fc56bc3b1d2b09588d4be514c77b32cb8f9 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Copy and paste the displayed link to your favorite browser. ## Local Installation -To run the notebooks on your local machine, you may use [Anaconda](https://www.anaconda.com/) (using `pip` is also possible for experienced users. You have to install all the requirements listed in `environment.yml` and install the commands listed in `postBuild`). +To run the notebooks on your local machine, you may use [Anaconda](https://www.anaconda.com/) (using `pip` is also possible for experienced users. You have to install all the requirements listed in `environment.yml` and install the commands listed in `binder/postBuild`). * Install [Anaconda](https://www.anaconda.com/). * Download this repository to your local disk. You can download it as a zip-File or use `git`: @@ -49,8 +49,8 @@ To run the notebooks on your local machine, you may use [Anaconda](https://www.a * Run two final commands in the Anaconda prompt (with activated `jupyter-quickstart` environment): ```bash - chmod +x postBuild - postBuild + chmod +x binder/postBuild + binder/postBuild ``` If the latter command fails, please open `postBuild` and execute the commands listed there manually. diff --git a/binder/environment.yml b/binder/environment.yml new file mode 120000 index 0000000000000000000000000000000000000000..7a9c7905764710d41490b31b737ff4cf42c27448 --- /dev/null +++ b/binder/environment.yml @@ -0,0 +1 @@ +../environment.yml \ No newline at end of file diff --git a/postBuild b/binder/postBuild old mode 100644 new mode 100755 similarity index 100% rename from postBuild rename to binder/postBuild diff --git a/.gitlab-ci_trigger-binder.sh b/binder/trigger-binder.sh old mode 100644 new mode 100755 similarity index 100% rename from .gitlab-ci_trigger-binder.sh rename to binder/trigger-binder.sh