Commit 6afdb766 authored by Samuel GAIST's avatar Samuel GAIST

Version 2.0.0 revision 0

Update Python: 3.6
Update BOB: 5.0.0

Name changes for Scientific Python 3
parent f61fc8a3
Pipeline #24613 passed with stage
in 19 minutes and 39 seconds
......@@ -32,7 +32,7 @@ deploy_version:
only:
- /^push/ # Only for tags starting with 'push'
script:
- ALL_TAGS=`git tag --contains $CI_BUILD_REF`
- ALL_TAGS=`git tag --contains $CI_COMMIT_SHA`
- for TAG in $ALL_TAGS;
do
if [[ $TAG =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+r\.[[:digit:]]$ ]]; then
......
......@@ -35,7 +35,7 @@ ENV PATH $CONDA_PATH/bin:/usr/local/bin/beat:$PATH
RUN set -ex \
# Install the needed packages
&& apt-get update \
&& apt-get install -y curl bzip2 git \
&& apt-get install -y curl bzip2 \
&& apt-get clean \
\
# Install miniconda and create the environment
......@@ -51,61 +51,67 @@ RUN set -ex \
\
# Install the needed packages
&& conda install -y \
python=2.7 \
opencv=3.1.0 \
numpy=1.12.1 \
scipy=0.19.0 \
scikit-learn=0.18.1 \
scikit-image=0.13.0 \
python=3.6 \
opencv=3.3.1 \
numpy=1.15.1 \
scipy=1.1.0 \
scikit-image=0.14.0 \
scikit-learn=0.19.1 \
\
# Install bob
&& conda install -y \
bob.ap=2.1.2 \
bob.blitz=2.0.12 \
bob.core=2.1.7 \
bob.extension=2.3.9 \
bob.io.audio=2.0.4 \
bob.io.base=2.0.13 \
bob.io.image=2.2.1 \
bob.io.matlab=2.0.8 \
bob.io.video=2.0.14 \
bob.ip.base=2.0.14 \
bob.ip.color=2.0.8 \
bob.ip.draw=2.0.7 \
bob.ip.facedetect=2.1.2 \
bob.ip.flandmark=2.1.4 \
bob.ip.gabor=2.0.9 \
bob.ip.optflow.hornschunck=2.0.11 \
bob.ip.optflow.liu=2.0.10 \
bob.learn.activation=2.0.8 \
bob.learn.boosting=2.0.11 \
bob.learn.em=2.0.12 \
bob.learn.libsvm=2.0.10 \
bob.learn.linear=2.1.0 \
bob.learn.mlp=2.1.4 \
bob.math=2.1.0 \
bob.measure=2.3.0 \
bob.sp=2.0.8 \
\
&& conda clean -y -a \
\
bob=5.0.0 \
bob.ap=2.1.7 \
bob.blitz=2.0.16 \
bob.core=2.2.1 \
bob.extension=3.1.0 \
bob.io.audio=2.0.8 \
bob.io.base=3.0.4 \
bob.io.image=2.4.2 \
bob.io.matlab=2.0.12 \
bob.io.video=2.1.1 \
bob.ip.base=2.2.2 \
bob.ip.color=2.0.12 \
bob.ip.draw=2.0.11 \
bob.ip.facedetect=2.1.6 \
bob.ip.flandmark=2.1.8 \
bob.ip.gabor=2.0.13 \
bob.ip.optflow.hornschunck=2.0.15 \
bob.ip.optflow.liu=2.0.14 \
bob.learn.activation=2.0.12 \
bob.learn.boosting=2.0.15 \
bob.learn.em=2.1.2 \
bob.learn.libsvm=2.1.1 \
bob.learn.linear=2.1.4 \
bob.learn.mlp=2.1.8 \
bob.math=3.1.2 \
bob.measure=4.0.0 \
bob.sp=2.0.12 \
# Install the beat packages
&& pip install --upgrade pip \
&& pip install --src $CONDA_PATH/src -e git+https://gitlab.idiap.ch/beat/beat.backend.python.git@v1.5.0#egg=beat.backend.python \
\
beat.backend.python=1.5.2 \
&& conda clean -y -a
FROM debian:9.5
LABEL maintainer="Samuel Gaist <samuel.gaist@idiap.ch"
ARG PYTHON_VERSION
SHELL ["/bin/bash", "-c"]
# Change the PATH, so we can execute the scripts easily
ENV CONDA_PATH /opt/miniconda3
ENV PATH $CONDA_PATH/bin:/usr/local/bin/beat:$PATH
COPY --from=builder $CONDA_PATH $CONDA_PATH
RUN set -ex \
# Create the wrapper scripts for the executables
&& mkdir /usr/local/bin/beat \
&& printf '#! /bin/bash\n\ndescribe $1 $2\n' > /usr/local/bin/beat/describe \
&& printf '#! /bin/bash\n\nexecute $1 $2 $3\n' > /usr/local/bin/beat/execute \
&& chmod 755 /usr/local/bin/beat/describe \
&& chmod 755 /usr/local/bin/beat/execute \
\
# Cleanup
&& conda clean -y -a \
&& apt-get purge -y --auto-remove curl git \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& rm -rf /tmp/miniconda.sh
# Customisation of the environment
ADD environment.json /etc/beat/
# Customisation of the environment name
&& mkdir /etc/beat \
&& printf "{\n \"name\": \"Scientific Python 3\",\n \"version\": \"2.0.0\"\n}\n" > /etc/beat/environment.json
......@@ -9,7 +9,7 @@ backend of the BEAT platform.
To test the creation of a container on your machine, run the following command:
```sh
$ docker build --rm=true -t docker.idiap.ch/beat/beat.env.python:1.1.0r0 .
$ docker build --rm=true -t docker.idiap.ch/beat/beat.env.python:2.0.0r0 .
```
......
{
"name": "Scientific Python 2.7",
"version": "1.1.0",
"capabilities": [
"direct_access"
]
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment