From 1a8b32f2c850a5db7d38952a6c1f56220915037d Mon Sep 17 00:00:00 2001
From: Christian Rohlfing <rohlfing@ient.rwth-aachen.de>
Date: Thu, 21 Nov 2019 18:05:36 +0100
Subject: [PATCH] - bugfix
---
.gitlab-ci.yml | 10 +++++-----
Dockerfile | 2 +-
README.md | 6 +++---
binder/environment.yml | 1 +
postBuild => binder/postBuild | 0
.../trigger-binder.sh | 0
6 files changed, 10 insertions(+), 9 deletions(-)
create mode 120000 binder/environment.yml
rename postBuild => binder/postBuild (100%)
mode change 100644 => 100755
rename .gitlab-ci_trigger-binder.sh => binder/trigger-binder.sh (100%)
mode change 100644 => 100755
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 937ab2b..1d16d2e 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 ab459dd..4b40d29 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 695bc42..6a749fc 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 0000000..7a9c790
--- /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
--
GitLab