Merge branch 'acl' into 'develop'

Acl

See merge request !3

Dockerfile

@@ -39,7 +39,7 @@ RUN git clone "${CONTAINERPILOT_REPO_URL}" "/tmp/orchestrate" \
 
 # API messages description
 ARG MESSAGES_API_REPO_URL=https://gitlab.mim.ovh/EOLE/Zephir/messages-api.git
-ARG MESSAGES_API_REPO_REF=0.0.4-dev
+ARG MESSAGES_API_REPO_REF=0.0.6-dev
 
 RUN git clone "${MESSAGES_API_REPO_URL}" "/tmp/messages-api" \
     && cd /tmp/messages-api \
@@ -48,7 +48,7 @@ RUN git clone "${MESSAGES_API_REPO_URL}" "/tmp/messages-api" \
 
 # Common python Zéphir library
 ARG PYTHON_ZEPHIR_REPO_URL=https://gitlab.mim.ovh/EOLE/Zephir/python-zephir.git
-ARG PYTHON_ZEPHIR_REPO_REF=0.0.2-dev
+ARG PYTHON_ZEPHIR_REPO_REF=0.0.3-dev
 
 RUN git clone "${PYTHON_ZEPHIR_REPO_URL}" "/tmp/python-zephir" \
     && cd /tmp/python-zephir \
@@ -60,8 +60,8 @@ RUN git clone "${PYTHON_ZEPHIR_REPO_URL}" "/tmp/python-zephir" \
 ##
 
 # Configure package manager
-RUN echo "deb http://repo.saltstack.com/apt/ubuntu/18.04/amd64/latest bionic main" > /etc/apt/sources.list.d/saltstack.list
-RUN curl https://repo.saltstack.com/apt/ubuntu/18.04/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key --keyring /etc/apt/trusted.gpg.d/saltstack.gpg add -
+RUN echo "deb http://repo.saltstack.com/apt/ubuntu/18.04/amd64/2018.3 bionic main" > /etc/apt/sources.list.d/saltstack.list
+RUN curl https://repo.saltstack.com/apt/ubuntu/18.04/amd64/2018.3/SALTSTACK-GPG-KEY.pub | apt-key --keyring /etc/apt/trusted.gpg.d/saltstack.gpg add -
 
 # SaltStack formulas parameters
 ENV EOLE_FORMULA_DIR=/srv/formulas
@@ -96,7 +96,7 @@ RUN apt-get update -y && apt-get install -y \
     python3-psycopg2 \
     python3-requests \
     python3-yaml \
-    python-psycopg2 \
+    python3-pip \
     sqitch \
     tzdata
 
@@ -116,6 +116,8 @@ ENV LC_ALL fr_FR.UTF-8
 RUN ln -fs /usr/share/zoneinfo/Europe/Paris /etc/localtime
 RUN dpkg-reconfigure --frontend noninteractive tzdata
 
+RUN pip3 install casbin
+
 # Sqitch
 RUN sqitch config --user user.name 'Equipe EOLE'\
     && sqitch config --user user.email 'eole@ac-dijon.fr'
@@ -136,6 +138,7 @@ COPY --from=build /tmp/orchestrate/${services_conf_filename}.ctmpl ${services_co
 
 # Install libraries required by service
 COPY --from=build /tmp/python-zephir/zephir /usr/lib/python3/dist-packages/zephir
+COPY --from=build /tmp/python-zephir/acl /etc/acl
 COPY --from=build /tmp/messages-api/messages /srv/messages
 
 # Manage container with ContainerPilot
@@ -155,6 +158,7 @@ RUN apt-get update -y && apt-get install -y \
     python3-crypto \
     salt-api \
     salt-master \
+    python-psycopg2 \
     screen
 
 # Library for SaltMaster manager

containerpilot.json5

@@ -40,7 +40,7 @@
         },
         {
             name: "salt-master",
-            exec: ["salt-master", "-l", '{{ .SALTMASTER_LOG_LEVEL | default "debug" }}'],
+            exec: ["salt-master", "-l", '{{ .SALTMASTER_LOG_LEVEL | default "info" }}'],
             health: {
                 exec: "/bin/nc -z 127.0.0.1 30009",
                 interval: 10,
@@ -55,7 +55,7 @@
         },
         {
           name: "salt-api",
-          exec: ["salt-api", "-l", '{{ .SALT_API_LOG_LEVEL | default "debug" }}'],
+          exec: ["salt-api", "-l", '{{ .SALT_API_LOG_LEVEL | default "info" }}'],
           health: {
             exec: "/bin/nc -z 127.0.0.1 8000",
             interval: 10,