summaryrefslogtreecommitdiffstats
path: root/python/conda/linux_release
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-03-20 15:52:37 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-03-20 15:52:37 +0100
commit53eea5892cd1d51f802533adb9ea94e04b4ce86b (patch)
treeb6875f0aab543e1551c58bfe12d630717894284c /python/conda/linux_release
parent4d0d9ca396378813f8559f479ff9a64b0881a627 (diff)
parentcd32957185094680b84014e1ea8411ce6b142f74 (diff)
downloadastra-53eea5892cd1d51f802533adb9ea94e04b4ce86b.tar.gz
astra-53eea5892cd1d51f802533adb9ea94e04b4ce86b.tar.bz2
astra-53eea5892cd1d51f802533adb9ea94e04b4ce86b.tar.xz
astra-53eea5892cd1d51f802533adb9ea94e04b4ce86b.zip
Merge branch 'macOS'
Diffstat (limited to 'python/conda/linux_release')
-rw-r--r--python/conda/linux_release/builder/Dockerfile24
1 files changed, 12 insertions, 12 deletions
diff --git a/python/conda/linux_release/builder/Dockerfile b/python/conda/linux_release/builder/Dockerfile
index 8be05b8..2404609 100644
--- a/python/conda/linux_release/builder/Dockerfile
+++ b/python/conda/linux_release/builder/Dockerfile
@@ -2,16 +2,16 @@ FROM astra-build-env
ARG BUILD_NUMBER=
WORKDIR /root
RUN git clone --depth 1 https://github.com/astra-toolbox/astra-toolbox
-RUN [ -z $BUILD_NUMBER ] || perl -pi -e "s/^(\s*number:\s*)[0-9]+$/\${1}$BUILD_NUMBER/" astra-toolbox/python/conda/libastra/meta.yaml astra-toolbox/python/conda/meta.yaml
+RUN [ -z $BUILD_NUMBER ] || perl -pi -e "s/^(\s*number:\s*)[0-9]+$/\${1}$BUILD_NUMBER/" astra-toolbox/python/conda/libastra/meta.yaml astra-toolbox/python/conda/astra-toolbox/meta.yaml
RUN conda-build --python=3.5 astra-toolbox/python/conda/libastra
-RUN conda-build --python 2.7 --numpy 1.8 astra-toolbox/python/conda
-RUN conda-build --python 2.7 --numpy 1.9 astra-toolbox/python/conda
-RUN conda-build --python 2.7 --numpy 1.10 astra-toolbox/python/conda
-RUN conda-build --python 2.7 --numpy 1.11 astra-toolbox/python/conda
-RUN conda-build --python 2.7 --numpy 1.12 astra-toolbox/python/conda
-RUN conda-build --python 3.5 --numpy 1.9 astra-toolbox/python/conda
-RUN conda-build --python 3.5 --numpy 1.10 astra-toolbox/python/conda
-RUN conda-build --python 3.5 --numpy 1.11 astra-toolbox/python/conda
-RUN conda-build --python 3.5 --numpy 1.12 astra-toolbox/python/conda
-RUN conda-build --python 3.6 --numpy 1.11 astra-toolbox/python/conda
-RUN conda-build --python 3.6 --numpy 1.12 astra-toolbox/python/conda
+RUN conda-build --python 2.7 --numpy 1.8 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 2.7 --numpy 1.9 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 2.7 --numpy 1.10 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 2.7 --numpy 1.11 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 2.7 --numpy 1.12 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.5 --numpy 1.9 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.5 --numpy 1.10 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.5 --numpy 1.11 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.5 --numpy 1.12 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.6 --numpy 1.11 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.6 --numpy 1.12 astra-toolbox/python/conda/astra-toolbox