Merge branch 'master' of ssh://gitlab.warpzone.ms:444/infrastruktur/ansible-warpzone

webserver/docker_dokuwiki/tasks/main.yml

 ---
 - name: create folder struct for dokuwiki
-  file: 
-    path: "/srv/dokuwiki/" 
+  file:
+    path: "/srv/dokuwiki/"
     state: "directory"
 
-- name: create folder struct for dokuwiki 
-  file: 
-    path: "/tmp/dokuwiki_docker/" 
+- name: create folder struct for dokuwiki
+  file:
+    path: "/tmp/dokuwiki_docker/"
     state: "directory"
 
-- name: copy Dockerfile 
+- name: copy Dockerfile
   copy:
     src: Dockerfile
     dest: /tmp/dokuwiki_docker/Dockerfile
@@ -18,19 +18,12 @@
   command: "date +%Y%m%d%H%M%S"
   register: timestamp
 
-- name: build the image 
-  docker_image: 
-    name: "dokuwiki-{{ timestamp.stdout }}"
-    path: /tmp/dokuwiki_docker/
-    state: present
+- name: Docker Compose Konfig-Datei erstellen
+  template:
+    src: "docker-compose.yml"
+    dest: "/srv/dokuwiki/docker-compose.yml"
 
 - name: start dokuwiki docker
-  docker_container: 
-    name: dokuwiki-app
-    image: "dokuwiki-{{ timestamp.stdout }}"
-    state: started
-    restart_policy: always
-    volumes:
-      - /srv/dokuwiki:/var/www/html
-    ports:
-      - 127.0.0.1:42005:80
+  docker_service:
+    project_src: /srv/dokuwiki/
+    state: present

webserver/docker_dokuwiki/templates/docker-compose.yml

+version: "3"
+
+services:
+
+  app:
+
+    build: /tmp/dokuwiki_docker/
+    image: "dokuwiki-{{ timestamp.stdout }}"
+    restart: always
+    ports:
+      - 127.0.0.1:42005:80
+    volumes:
+      - /srv/dokuwiki:/var/www/html

webserver/docker_ldap/tasks/main.yml

@@ -50,8 +50,8 @@
       LDAP_READONLY_USER_USERNAME: readonly
       LDAP_READONLY_USER_PASSWORD: "{{ ldap_readonly_pass }}"
     ports:
-      - {{ ldap_ip_ext }}:389:389
-      - {{ ldap_ip_ext }}:636:636
+      - "{{ ldap_ip_ext }}:389:389"
+      - "{{ ldap_ip_ext }}:636:636"
 
 - name: start phpldapadmin docker
   docker_container: