diff --git a/webserver/docker_dokuwiki/tasks/main.yml b/webserver/docker_dokuwiki/tasks/main.yml index 81ec5cb21d914501c17733edb4e6bcc47de8923f..2e7590e0d4fc0b28dccae3e403202ed25bff015d 100644 --- a/webserver/docker_dokuwiki/tasks/main.yml +++ b/webserver/docker_dokuwiki/tasks/main.yml @@ -1,15 +1,15 @@ --- - 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 diff --git a/webserver/docker_dokuwiki/templates/docker-compose.yml b/webserver/docker_dokuwiki/templates/docker-compose.yml new file mode 100644 index 0000000000000000000000000000000000000000..0129b312d19a0ee1d489cc5f74f0eff17caec635 --- /dev/null +++ b/webserver/docker_dokuwiki/templates/docker-compose.yml @@ -0,0 +1,13 @@ +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 diff --git a/webserver/docker_ldap/tasks/main.yml b/webserver/docker_ldap/tasks/main.yml index 6c250ac0a17316a7c6aa3c45a31408d92a969a82..9a603ab1f95c8e26e3915e3b6caf5edf4d3b8e5d 100644 --- a/webserver/docker_ldap/tasks/main.yml +++ b/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: