Update warpinfra und umstellung auf docker-compose

warpsrvint/docker_warpinfratest/templates/docker-compose.yml

@@ -8,14 +8,14 @@ services:
     image: mariadb:10.1
     restart: always
     ports:
-      - 23306:3306
+      - 127.0.0.1:23306:3306
     volumes:
       - /srv/warpinfratest/db/:/var/lib/mysql
     environment:
       MYSQL_DATABASE: warpinfra
       MYSQL_USER: warpinfra
       MYSQL_PASSWORD: {{ mysql_user_pw }}
-      MYSQL_ROOT_PASSWOR: ={{ mysql_root_pw }}
+      MYSQL_ROOT_PASSWORD: {{ mysql_root_pw }}
 
   app:
 
@@ -23,7 +23,7 @@ services:
     image: warpinfratest:{{ gitclone.after }}
     restart: always
     depends_on:
-      - "db"
+      - db
     ports:
       - 0.0.0.0:8000:8000
     volumes:

webserver/docker_warpinfra/tasks/main.yml

@@ -13,6 +13,8 @@
     - /srv/ldap/secret/ldap_readonly_pass
     - /srv/warpinfra/secret/mattermost_api_key
     - /srv/warpinfra/secret/web_secret_key
+    - /srv/warpinfra/secret/mysql_root_pw
+    - /srv/warpinfra/secret/mysql_user_pw
   register: warpinfra_secrets
 
 - name: get secrets from server 2
@@ -22,6 +24,8 @@
     ldap_readonly_pass: "{{ warpinfra_secrets.results | selectattr('item', 'equalto', '/srv/ldap/secret/ldap_readonly_pass') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
     mattermost_api_key: "{{ warpinfra_secrets.results | selectattr('item', 'equalto', '/srv/warpinfra/secret/mattermost_api_key') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
     web_secret_key: "{{ warpinfra_secrets.results | selectattr('item', 'equalto', '/srv/warpinfra/secret/web_secret_key') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
+    mysql_root_pw: "{{ warpinfra_secrets.results | selectattr('item', 'equalto', '/srv/warpinfra/secret/mysql_root_pw') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
+    mysql_user_pw: "{{ warpinfra_secrets.results | selectattr('item', 'equalto', '/srv/warpinfra/secret/mysql_user_pw') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
 
 - name: create folder struct for warpinfra 
   file: 
@@ -46,7 +50,7 @@
 - name: clone repo
   git: 
     repo: "https://gitlab.warpzone.ms/infrastruktur/warpinfra.git" 
-    version: "1.1"
+    version: "1.2"
     dest: "/tmp/warpinfra_docker" 
     force: "yes"
   register: gitclone 
@@ -64,27 +68,13 @@
     src: "config.ini" 
     dest: "/srv/warpinfra/etc/config.ini"
 
-# commit id in den Namen des Image einbeziehen
-# als tag scheint von docker_image nicht korrekt gesetzt zu werden 
-
-- name: build the image 
-  docker_image: 
-    name: "warpinfra-app-{{ gitclone.after }}"
-    path: /tmp/warpinfra_docker/www/
+- name: Konfig-Datei erstellen
+  template: 
+    src: "docker-compose.yml" 
+    dest: "/srv/warpinfra/docker-compose.yml"
+        
+- name: start warpinfratest docker
+  docker_service:
+    project_src: /srv/warpinfra/
     state: present
-      
-- name: start warpinfra docker
-  docker_container: 
-    name: warpinfra-app
-    image: "warpinfra-app-{{ gitclone.after }}"
-    state: started
-    interactive: yes
-    restart_policy: always
-    volumes:
-      - /tmp/warpinfra:/opt/socket
-      - /srv/warpinfra/etc:/etc/warpinfra
-      - /srv/warpinfra/data:/opt/database
-      - /srv/warpinfra/log:/opt/log
-    links: 
-      - ldap-service:ldap
 

webserver/docker_warpinfra/templates/config.ini

@@ -18,8 +18,15 @@ ALLOWED_HOSTS = infra.warpzone.ms
 [mattermost]
 API_KEY = {{mattermost_api_key}}
 
+[mysql]
+MYSQL_HOST = db 
+MYSQL_PORT = 3306 
+MYSQL_USER = warpinfra
+MYSQL_PASS = {{ mysql_user_pw }}
+MYSQL_NAME = warpinfra
+
 [ldap]
-LDAP_HOST = ldap
+LDAP_HOST = 10.0.20.2
 LDAP_BIND_DN = cn=admin,dc=warpzone,dc=ms
 LDAP_PASSWORD = {{ ldap_admin_pass }}
 

webserver/docker_warpinfra/templates/docker-compose.yml

+
+version: "3"
+
+services:
+
+  db:
+
+    image: mariadb:10.1
+    restart: always
+    ports:
+      - 127.0.0.1:13306:3306
+    volumes:
+      - /srv/warpinfra/db/:/var/lib/mysql
+    environment:
+      MYSQL_DATABASE: warpinfra
+      MYSQL_USER: warpinfra
+      MYSQL_PASSWORD: {{ mysql_user_pw }}
+      MYSQL_ROOT_PASSWORD: {{ mysql_root_pw }}
+
+  app:
+
+    build: /tmp/warpinfra_docker/www/
+    image: warpinfra:{{ gitclone.after }}
+    restart: always
+    depends_on:
+      - db
+    volumes:
+      - /tmp/warpinfra:/opt/socket
+      - /srv/warpinfra/etc:/etc/warpinfra
+      - /srv/warpinfra/data:/opt/database
+      - /srv/warpinfra/log:/opt/log

webserver/docker_warpinfratest/tasks/main.yml

@@ -13,6 +13,8 @@
     - /srv/ldap/secret/ldap_readonly_pass
     - /srv/warpinfratest/secret/mattermost_api_key
     - /srv/warpinfratest/secret/web_secret_key
+    - /srv/warpinfratest/secret/mysql_root_pw
+    - /srv/warpinfratest/secret/mysql_user_pw
   register: warpinfratest_secrets
 
 - name: get secrets from server 2
@@ -22,6 +24,8 @@
     ldap_readonly_pass: "{{ warpinfratest_secrets.results | selectattr('item', 'equalto', '/srv/ldap/secret/ldap_readonly_pass') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
     mattermost_api_key: "{{ warpinfratest_secrets.results | selectattr('item', 'equalto', '/srv/warpinfratest/secret/mattermost_api_key') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
     web_secret_key: "{{ warpinfratest_secrets.results | selectattr('item', 'equalto', '/srv/warpinfratest/secret/web_secret_key') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
+    mysql_root_pw: "{{ warpinfratest_secrets.results | selectattr('item', 'equalto', '/srv/warpinfratest/secret/mysql_root_pw') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
+    mysql_user_pw: "{{ warpinfratest_secrets.results | selectattr('item', 'equalto', '/srv/warpinfratest/secret/mysql_user_pw') | map(attribute='content') | list | first | b64decode | regex_replace('\\s', '') }}" 
 
 - name: create folder struct for warpinfratest
   file: 
@@ -63,27 +67,12 @@
     src: "config.ini" 
     dest: "/srv/warpinfratest/etc/config.ini"
 
-# commit id in den Namen des Image einbeziehen
-# als tag scheint von docker_image nicht korrekt gesetzt zu werden 
-
-- name: build the image 
-  docker_image: 
-    name: "warpinfra-test-{{ gitclone.after }}"
-    path: /tmp/warpinfratest_docker/www/
-    state: present
-      
+- name: Konfig-Datei erstellen
+  template: 
+    src: "docker-compose.yml" 
+    dest: "/srv/warpinfratest/docker-compose.yml"
+        
 - name: start warpinfratest docker
-  docker_container: 
-    name: warpinfra-test
-    image: "warpinfra-test-{{ gitclone.after }}"
-    state: started
-    interactive: yes
-    restart_policy: always
-    volumes:
-      - /tmp/warpinfratest:/opt/socket
-      - /srv/warpinfratest/etc:/etc/warpinfra
-      - /srv/warpinfratest/data:/opt/database
-      - /srv/warpinfratest/log:/opt/log
-    links: 
-      - ldap-service:ldap
-
+  docker_service:
+    project_src: /srv/warpinfratest/
+    state: present

webserver/docker_warpinfratest/templates/config.ini

 
 [common] 
 # Possible Apps: warpmain, warpauth, warpfood, warpapi, warppay 
-APPS = warpmain, warpauth, warpfood, warpapi, warppay
+APPS = warpmain, warpauth, warpfood, warpapi
 
 INSTANCE_NAME = 'EXTERN-TEST'
 GIT_COMMIT = '{{ gitclone.after }}'
@@ -18,8 +18,15 @@ ALLOWED_HOSTS = infra.warpzone.ms
 [mattermost]
 API_KEY = {{mattermost_api_key}}
 
+[mysql]
+MYSQL_HOST = db 
+MYSQL_PORT = 3306 
+MYSQL_USER = warpinfra
+MYSQL_PASS = {{ mysql_user_pw }}
+MYSQL_NAME = warpinfra
+
 [ldap]
-LDAP_HOST = ldap
+LDAP_HOST = 10.0.20.2
 LDAP_BIND_DN = cn=admin,dc=warpzone,dc=ms
 LDAP_PASSWORD = {{ ldap_admin_pass }}
 

webserver/docker_warpinfratest/templates/docker-compose.yml

+
+version: "3"
+
+services:
+
+  db:
+
+    image: mariadb:10.1
+    restart: always
+    ports:
+      - 127.0.0.1:23306:3306
+    volumes:
+      - /srv/warpinfratest/db/:/var/lib/mysql
+    environment:
+      MYSQL_DATABASE: warpinfra
+      MYSQL_USER: warpinfra
+      MYSQL_PASSWORD: {{ mysql_user_pw }}
+      MYSQL_ROOT_PASSWORD: {{ mysql_root_pw }}
+
+  app:
+
+    build: /tmp/warpinfratest_docker/www/
+    image: warpinfratest:{{ gitclone.after }}
+    restart: always
+    depends_on:
+      - db
+    volumes:
+      - /tmp/warpinfratest:/opt/socket
+      - /srv/warpinfratest/etc:/etc/warpinfra
+      - /srv/warpinfratest/data:/opt/database
+      - /srv/warpinfratest/log:/opt/log