Commit 9aad3ca7 authored by Lionel Morin's avatar Lionel Morin
Browse files

Merge branch 'acl' into 'develop'

Acl

See merge request !3
parents 01486174 835085ae
Pipeline #310 passed with stage
in 0 seconds
...@@ -39,7 +39,7 @@ RUN git clone "${CONTAINERPILOT_REPO_URL}" "/tmp/orchestrate" \ ...@@ -39,7 +39,7 @@ RUN git clone "${CONTAINERPILOT_REPO_URL}" "/tmp/orchestrate" \
# API messages description # API messages description
ARG MESSAGES_API_REPO_URL=https://gitlab.mim.ovh/EOLE/Zephir/messages-api.git 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" \ RUN git clone "${MESSAGES_API_REPO_URL}" "/tmp/messages-api" \
&& cd /tmp/messages-api \ && cd /tmp/messages-api \
...@@ -48,7 +48,7 @@ RUN git clone "${MESSAGES_API_REPO_URL}" "/tmp/messages-api" \ ...@@ -48,7 +48,7 @@ RUN git clone "${MESSAGES_API_REPO_URL}" "/tmp/messages-api" \
# Common python Zéphir library # Common python Zéphir library
ARG PYTHON_ZEPHIR_REPO_URL=https://gitlab.mim.ovh/EOLE/Zephir/python-zephir.git 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" \ RUN git clone "${PYTHON_ZEPHIR_REPO_URL}" "/tmp/python-zephir" \
&& cd /tmp/python-zephir \ && cd /tmp/python-zephir \
...@@ -60,8 +60,8 @@ RUN git clone "${PYTHON_ZEPHIR_REPO_URL}" "/tmp/python-zephir" \ ...@@ -60,8 +60,8 @@ RUN git clone "${PYTHON_ZEPHIR_REPO_URL}" "/tmp/python-zephir" \
## ##
# Configure package manager # 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 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/latest/SALTSTACK-GPG-KEY.pub | apt-key --keyring /etc/apt/trusted.gpg.d/saltstack.gpg add - 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 # SaltStack formulas parameters
ENV EOLE_FORMULA_DIR=/srv/formulas ENV EOLE_FORMULA_DIR=/srv/formulas
...@@ -96,7 +96,7 @@ RUN apt-get update -y && apt-get install -y \ ...@@ -96,7 +96,7 @@ RUN apt-get update -y && apt-get install -y \
python3-psycopg2 \ python3-psycopg2 \
python3-requests \ python3-requests \
python3-yaml \ python3-yaml \
python-psycopg2 \ python3-pip \
sqitch \ sqitch \
tzdata tzdata
...@@ -116,6 +116,8 @@ ENV LC_ALL fr_FR.UTF-8 ...@@ -116,6 +116,8 @@ ENV LC_ALL fr_FR.UTF-8
RUN ln -fs /usr/share/zoneinfo/Europe/Paris /etc/localtime RUN ln -fs /usr/share/zoneinfo/Europe/Paris /etc/localtime
RUN dpkg-reconfigure --frontend noninteractive tzdata RUN dpkg-reconfigure --frontend noninteractive tzdata
RUN pip3 install casbin
# Sqitch # Sqitch
RUN sqitch config --user user.name 'Equipe EOLE'\ RUN sqitch config --user user.name 'Equipe EOLE'\
&& sqitch config --user user.email 'eole@ac-dijon.fr' && sqitch config --user user.email 'eole@ac-dijon.fr'
...@@ -136,6 +138,7 @@ COPY --from=build /tmp/orchestrate/${services_conf_filename}.ctmpl ${services_co ...@@ -136,6 +138,7 @@ COPY --from=build /tmp/orchestrate/${services_conf_filename}.ctmpl ${services_co
# Install libraries required by service # Install libraries required by service
COPY --from=build /tmp/python-zephir/zephir /usr/lib/python3/dist-packages/zephir 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 COPY --from=build /tmp/messages-api/messages /srv/messages
# Manage container with ContainerPilot # Manage container with ContainerPilot
...@@ -155,6 +158,7 @@ RUN apt-get update -y && apt-get install -y \ ...@@ -155,6 +158,7 @@ RUN apt-get update -y && apt-get install -y \
python3-crypto \ python3-crypto \
salt-api \ salt-api \
salt-master \ salt-master \
python-psycopg2 \
screen screen
# Library for SaltMaster manager # Library for SaltMaster manager
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
}, },
{ {
name: "salt-master", name: "salt-master",
exec: ["salt-master", "-l", '{{ .SALTMASTER_LOG_LEVEL | default "debug" }}'], exec: ["salt-master", "-l", '{{ .SALTMASTER_LOG_LEVEL | default "info" }}'],
health: { health: {
exec: "/bin/nc -z 127.0.0.1 30009", exec: "/bin/nc -z 127.0.0.1 30009",
interval: 10, interval: 10,
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
}, },
{ {
name: "salt-api", name: "salt-api",
exec: ["salt-api", "-l", '{{ .SALT_API_LOG_LEVEL | default "debug" }}'], exec: ["salt-api", "-l", '{{ .SALT_API_LOG_LEVEL | default "info" }}'],
health: { health: {
exec: "/bin/nc -z 127.0.0.1 8000", exec: "/bin/nc -z 127.0.0.1 8000",
interval: 10, interval: 10,
......
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