Merge pull request #6 from xgaia/master

Askomics 18.10

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/
 

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`