From a78188cb6f250ef906ef5ef0cc33b20c8cd35356 Mon Sep 17 00:00:00 2001 From: xgaia Date: Mon, 10 Dec 2018 12:15:09 +0100 Subject: [PATCH] fetch askomics 18.10 --- Dockerfile | 15 ++++++++------- README.md | 8 ++++++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 86ae02f..d69955d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,21 @@ FROM alpine -MAINTAINER Olivier Filangi "olivier.filangi@inra.fr" +MAINTAINER Xavier Garnier "xavier.garnier@irisa.fr" # Environment variables ENV ASKOMICS="https://github.com/askomics/askomics.git" \ - ASKOMICS_DIR="/usr/local/askomics" + ASKOMICS_DIR="/usr/local/askomics" \ + ASKOMICS_VERSION="18.10" # Install prerequisites, clone repository and install RUN apk add --update bash make gcc g++ zlib-dev libzip-dev bzip2-dev xz-dev git python3 python3-dev nodejs nodejs-npm linux-headers && \ - git clone ${ASKOMICS} ${ASKOMICS_DIR} && \ + git clone -b ${ASKOMICS_VERSION} --single-branch --depth=1 ${ASKOMICS} ${ASKOMICS_DIR} && \ cd ${ASKOMICS_DIR} && \ - npm install gulp -g && \ npm install --production && \ - chmod +x startAskomics.sh && \ - rm -rf /usr/local/askomics/venv && \ bash ./startAskomics.sh -b && \ - rm -rf /var/cache/apk/* + rm -rf /var/cache/apk/* && \ + rm -rf /root/.cache/* && \ + rm -rf /root/.npm/* && \ + rm -rf /tmp/* WORKDIR /usr/local/askomics/ diff --git a/README.md b/README.md index 7f06080..e579f64 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,15 @@ ## Run - docker run --name askomics -p 6543:6543 d askomics/askomics + docker run --name askomics -p 6543:6543 -d askomics/askomics -## .ini configuration +## askomics.ini configuration All askomics properties defined in section [app:main] of the .ini file can be configured via the environment variables. The environment variable should be prefixed with ASKO_, without the askomics. For exemple, if ou want to modify `askomics.overview_lines_limit = 200` of the ini file, you must declare a environment variable like `ASKO_overview_lines_limit="1000"` + +For the other ini entry, you can use `ASKOCONFIG_section_key=value` environment variables. use `_colon_`, `_hyphen_` and `_dot_` instead of `:`, `-` and `.`. + +`ASKOCONFIG_app_colon_main_pyramid_dot_debug_authorization="true"` will write `pyramid.debug_authorization = true`