Merge branch 'tx-services-p19-test' of...

Merge branch 'tx-services-p19-test' of gitlab.utc.fr:picasoft/projets/dockerfiles into tx-services-p19-test

pica-form/Dockerfile

+FROM node:slim as base
+LABEL maintainer="remy.huet@etu.utc.fr"
+
+FROM base as downloader
+RUN apt-get update && \
+    apt-get install -y \
+	bzip2 \
+    	git \
+	gzip \
+	unzip && \
+    mkdir /opt/tellform && \
+    chown -R node /opt/tellform && \
+    npm install -g bower grunt-cli
+
+USER node
+WORKDIR /opt/tellform
+
+# Trouver mieux que le git clone...
+RUN git clone https://github.com/tellform/tellform .
+RUN npm install
+RUN bower install
+RUN grunt build
+
+FROM base
+
+COPY entrypoint.sh /opt/tellform/entrypoint.sh
+RUN chmod +x /opt/tellform/entrypoint.sh && \
+    mkdir -p /opt/tellform && \
+    chown -R node /opt/tellform && \
+    usermod -d /opt/tellform node
+
+COPY --from=downloader --chown=node /opt/tellform /opt/tellform
+
+USER node
+WORKDIR /opt/tellform
+ENTRYPOINT ["./entrypoint.sh"]
+CMD ["bash"]
+
+EXPOSE 3000

pica-form/docker-compose.yml

+version : "2.4"
+services:
+        mongo:
+                image: mongo
+                container_name: mongo
+                environment:
+                        - MONGO_INITDB_ROOT_USERNAME=root
+                        - MONGO_INITDB_ROOT_PASSWORD=example
+        tellform:
+                image: tellform
+                container_name: tellform
+                links:
+                        - mongo:mongo-db
+                env_file: ./env.secrets
+                environment:
+                        - MONGO_DB_URI=mongodb://mongo-db/tellform
+                        - MAILER_FROM=huetremy@picasoft.net
+                        - MAILER_SMTP_HOST=mail.picasoft.net
+                        - MAILER_SMTP_PORT=465

pica-form/entrypoint.sh

+#!/bin/bash
+
+set -e
+
+: ${MONGO_DB_URI:=localhost}
+: ${BASE_URL:=localhost:3000}
+: ${MAILER_EMAIL_ID:=test}
+: ${MAILER_PASSWORD:=test}
+: ${MAILER_FROM:=test@example.com}
+: ${MAILER_SMTP_HOST:=example.net}
+: ${MAILER_SMTP_PORT:=25}
+: ${MAILER_SMTP_SECURE:=TRUE}
+
+cat << EOF > /opt/tellform/.env
+MONGO_DB_URI=$MONGO_DB_URI
+BASE_URL=$BASE_URL
+MAILER_EMAIL_ID=$MAILER_EMAIL_ID
+MAILER_PASSWORD=$MAILER_PASSWORD
+MAILER_FROM=$MAILER_FROM
+MAILER_SMTP_HOST=$MAILER_SMTP_HOST
+MAILER_SMTP_PORT=$MAILER_SMTP_PORT
+MAILER_SMTP_SECURE=$MAILER_SMTP_SECURE
+EOF
+
+exec "$@"

pica-wekan-scripts/Dockerfile

 from alpine
 
-ENV DRYRUN=1
+ENV DRYRUN=1 \
+    url="https://wekan.test.picasoft.net" \
+    CRON_TIME="0 0 1 * *"
 
 COPY *.sh ./
 
-RUN apk add --no-cache curl jq
+RUN apk add --no-cache --update curl jq
 
 ENTRYPOINT /bin/sh ./run.sh
+
+

pica-wekan-scripts/docker-compose.yml

@@ -2,9 +2,7 @@ version: '3'
 
 services:
   wekan-cleaner:
-    build:
-      context: ./ 
-      dockerfile: Dockerfile-clean
+    image: registry.picasoft.net/pica-wekan-cleaner
     environment:
        - DRYRUN=1
     container_name: wekan_clean 

pica-wekan/Dockerfile-clean

-from alpine
-
-ENV DRYRUN=true
-
-# COPY test.sh ./
-
-RUN apk add --no-cache curl jq
-RUN if [ $DRYRUN = false ]; \
-    then \
-      export ARGS="-d";\ 
-    else \
-      export ARGS="-t";\
-    fi
-
-ENTRYPOINT /bin/sh ./test.sh

pica-wekan/docker-compose-clean.yml

-version: '3'
-
-services:
-  wekan-cleaner:
-    build:
-      context: ./ 
-      dockerfile: Dockerfile-clean
-    environment:
-       - DRYRUN=false
-    container_name: wekan_clean