From 3879289303579741ed96c6c1c8d8f1e672a4197c Mon Sep 17 00:00:00 2001
From: Jens Sandmann <jens@sandzwerg.de>
Date: Sun, 15 Oct 2017 03:30:35 +0200
Subject: [PATCH] Dokuwiki: ansible auf docker-compose umgestellt
---
webserver/docker_dokuwiki/tasks/main.yml | 33 ++++++++-----------
.../templates/docker-compose.yml | 13 ++++++++
2 files changed, 26 insertions(+), 20 deletions(-)
create mode 100644 webserver/docker_dokuwiki/templates/docker-compose.yml
diff --git a/webserver/docker_dokuwiki/tasks/main.yml b/webserver/docker_dokuwiki/tasks/main.yml
index 81ec5cb2..2e7590e0 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 00000000..0129b312
--- /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
--
GitLab