Commit f61fc8a3 authored by Samuel GAIST's avatar Samuel GAIST

Version 1.1.0 revision 0

Update base OS: Debian 9.5
Update beat.backend.python: 1.5.0
parent a36f124f
Pipeline #23924 passed with stage
in 20 minutes and 23 seconds
# ignore .git and .cache folders and python related dynamic files
.git
.cache
__pycache__
*.pyc
......@@ -9,7 +9,7 @@ variables:
before_script:
- docker info
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN docker.idiap.ch
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN docker.idiap.ch
build:
......@@ -17,7 +17,7 @@ build:
only:
- /^v\d+\.\d+\.\d+r\d+$/
variables:
CONTAINER_NAME: $DOCKER_REGISTRY/$CI_PROJECT_PATH:$CI_BUILD_REF_NAME
CONTAINER_NAME: $DOCKER_REGISTRY/$CI_PROJECT_PATH:$CI_COMMIT_REF_NAME
script:
- CONTAINER_NAME=${CONTAINER_NAME/:v/:};
- docker build --rm=true -t $CONTAINER_NAME .
......
......@@ -22,28 +22,33 @@
# #
###############################################################################
FROM debian:8.4
MAINTAINER Philip Abbet <philip.abbet@idiap.ch>
FROM debian:9.5 as builder
LABEL maintainer="Samuel Gaist <samuel.gaist@idiap.ch"
ADD Miniconda2-latest-Linux-x86_64.sh /tmp
SHELL ["/bin/bash", "-c"]
# Change the PATH, so we can execute the scripts easily
ENV PATH /opt/miniconda2/bin:/usr/local/bin/beat:$PATH
ENV CONDA_PATH /opt/miniconda3
ENV PATH $CONDA_PATH/bin:/usr/local/bin/beat:$PATH
RUN set -ex \
# Install the needed packages
&& apt-get update \
&& apt-get install -y bzip2 git \
&& apt-get install -y curl bzip2 git \
&& apt-get clean \
\
# Install miniconda and create the environment
&& cd /tmp \
&& bash Miniconda2-latest-Linux-x86_64.sh -b -p /opt/miniconda2 \
&& curl -so miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh \
&& bash miniconda.sh -b -p $CONDA_PATH \
&& conda config --add channels defaults \
&& conda config --add channels https://www.idiap.ch/software/bob/conda \
\
# Ensure conda version is at least 4.4.11
# (because of this issue: https://github.com/conda/conda/issues/6811)
&& conda install -y "conda>=4.4.11" \
\
# Install the needed packages
&& conda install -y \
python=2.7 \
......@@ -52,7 +57,7 @@ RUN set -ex \
scipy=0.19.0 \
scikit-learn=0.18.1 \
scikit-image=0.13.0 \
\
# Install bob
&& conda install -y \
bob.ap=2.1.2 \
......@@ -81,23 +86,26 @@ RUN set -ex \
bob.math=2.1.0 \
bob.measure=2.3.0 \
bob.sp=2.0.8 \
\
&& conda clean -y -a \
\
# Install the beat packages
&& pip install -e git+https://gitlab.idiap.ch/beat/beat.backend.python.git@v1.4.1#egg=beat.backend.python \
&& 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 \
\
# 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 git \
&& apt-get purge -y --auto-remove curl git \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& rm -rf /tmp/Miniconda2-latest-Linux-x86_64.sh
&& rm -rf /tmp/miniconda.sh
# Customisation of the environment
ADD environment.json /etc/beat/
This diff is collapsed.
......@@ -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.0.0r3 .
$ docker build --rm=true -t docker.idiap.ch/beat/beat.env.python:1.1.0r0 .
```
......
{
"name": "Scientific Python 2.7",
"version": "1.0.0",
"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