From 8461160226a1587a355bf199dbbf6dede2155935 Mon Sep 17 00:00:00 2001
From: Christian Elberfeld <elberfeld@web.de>
Date: Sun, 15 Oct 2017 04:43:51 +0200
Subject: [PATCH] timestamp aus facts generieren
---
warpsrvint/docker_warpinfra/tasks/main.yml | 4 ----
warpsrvint/docker_warpinfra/templates/config.ini | 2 +-
warpsrvint/docker_warpinfratest/tasks/main.yml | 4 ----
warpsrvint/docker_warpinfratest/templates/config.ini | 2 +-
webserver/docker_dokuwiki/tasks/main.yml | 4 ----
webserver/docker_dokuwiki/templates/docker-compose.yml | 2 +-
webserver/docker_warpinfra/tasks/main.yml | 4 ----
webserver/docker_warpinfra/templates/config.ini | 2 +-
webserver/docker_warpinfratest/tasks/main.yml | 4 ----
webserver/docker_warpinfratest/templates/config.ini | 2 +-
10 files changed, 5 insertions(+), 25 deletions(-)
diff --git a/warpsrvint/docker_warpinfra/tasks/main.yml b/warpsrvint/docker_warpinfra/tasks/main.yml
index 865908f3..c435e51b 100644
--- a/warpsrvint/docker_warpinfra/tasks/main.yml
+++ b/warpsrvint/docker_warpinfra/tasks/main.yml
@@ -57,10 +57,6 @@
debug:
msg: "{{gitclone}}"
-- name: Get a timestamp
- command: "date +%d.%m.%Y"
- register: timestamp
-
- name: Konfig-Datei erstellen
template:
src: "config.ini"
diff --git a/warpsrvint/docker_warpinfra/templates/config.ini b/warpsrvint/docker_warpinfra/templates/config.ini
index 67e6e525..732a35a7 100644
--- a/warpsrvint/docker_warpinfra/templates/config.ini
+++ b/warpsrvint/docker_warpinfra/templates/config.ini
@@ -5,7 +5,7 @@ APPS = warpmain, warpauth, warppay
INSTANCE_NAME = 'INTERN-PRODUKTIV'
GIT_COMMIT = '{{ gitclone.after }}'
-DEPLOY_DATE = '{{ timestamp.stdout }}'
+DEPLOY_DATE = '{{ ansible_date_time.date }}--{{ ansible_date_time.hour }}-{{ ansible_date_time.minute }}'
[debug]
DEBUG = False
diff --git a/warpsrvint/docker_warpinfratest/tasks/main.yml b/warpsrvint/docker_warpinfratest/tasks/main.yml
index d6c77f64..9a0e8e93 100644
--- a/warpsrvint/docker_warpinfratest/tasks/main.yml
+++ b/warpsrvint/docker_warpinfratest/tasks/main.yml
@@ -56,10 +56,6 @@
debug:
msg: "{{gitclone}}"
-- name: Get a timestamp
- command: "date +%d.%m.%Y"
- register: timestamp
-
- name: Konfig-Datei erstellen
template:
src: "config.ini"
diff --git a/warpsrvint/docker_warpinfratest/templates/config.ini b/warpsrvint/docker_warpinfratest/templates/config.ini
index c56d5140..4dcff26d 100644
--- a/warpsrvint/docker_warpinfratest/templates/config.ini
+++ b/warpsrvint/docker_warpinfratest/templates/config.ini
@@ -5,7 +5,7 @@ APPS = warpmain, warpauth, warppay
INSTANCE_NAME = 'INTERN-TEST'
GIT_COMMIT = '{{ gitclone.after }}'
-DEPLOY_DATE = '{{ timestamp.stdout }}'
+DEPLOY_DATE = '{{ ansible_date_time.date }}--{{ ansible_date_time.hour }}-{{ ansible_date_time.minute }}'
[debug]
DEBUG = True
diff --git a/webserver/docker_dokuwiki/tasks/main.yml b/webserver/docker_dokuwiki/tasks/main.yml
index 2e7590e0..8c102211 100644
--- a/webserver/docker_dokuwiki/tasks/main.yml
+++ b/webserver/docker_dokuwiki/tasks/main.yml
@@ -14,10 +14,6 @@
src: Dockerfile
dest: /tmp/dokuwiki_docker/Dockerfile
-- name: Get a timestamp
- command: "date +%Y%m%d%H%M%S"
- register: timestamp
-
- name: Docker Compose Konfig-Datei erstellen
template:
src: "docker-compose.yml"
diff --git a/webserver/docker_dokuwiki/templates/docker-compose.yml b/webserver/docker_dokuwiki/templates/docker-compose.yml
index 0129b312..918539df 100644
--- a/webserver/docker_dokuwiki/templates/docker-compose.yml
+++ b/webserver/docker_dokuwiki/templates/docker-compose.yml
@@ -5,7 +5,7 @@ services:
app:
build: /tmp/dokuwiki_docker/
- image: "dokuwiki-{{ timestamp.stdout }}"
+ image: "dokuwiki--{{ ansible_date_time.date }}--{{ ansible_date_time.hour }}-{{ ansible_date_time.minute }}-{{ ansible_date_time.second }}"
restart: always
ports:
- 127.0.0.1:42005:80
diff --git a/webserver/docker_warpinfra/tasks/main.yml b/webserver/docker_warpinfra/tasks/main.yml
index ac78600c..b1f4c1a0 100644
--- a/webserver/docker_warpinfra/tasks/main.yml
+++ b/webserver/docker_warpinfra/tasks/main.yml
@@ -57,10 +57,6 @@
debug:
msg: "{{gitclone}}"
-- name: Get a timestamp
- command: "date +%d.%m.%Y"
- register: timestamp
-
- name: Konfig-Datei erstellen
template:
src: "config.ini"
diff --git a/webserver/docker_warpinfra/templates/config.ini b/webserver/docker_warpinfra/templates/config.ini
index 71b2167f..f1d8964d 100644
--- a/webserver/docker_warpinfra/templates/config.ini
+++ b/webserver/docker_warpinfra/templates/config.ini
@@ -5,7 +5,7 @@ APPS = warpmain, warpauth, warpfood
INSTANCE_NAME = 'EXTERN-PRODUKTIV'
GIT_COMMIT = '{{ gitclone.after }}'
-DEPLOY_DATE = '{{ timestamp.stdout }}'
+DEPLOY_DATE = '{{ ansible_date_time.date }}--{{ ansible_date_time.hour }}-{{ ansible_date_time.minute }}'
[debug]
DEBUG = False
diff --git a/webserver/docker_warpinfratest/tasks/main.yml b/webserver/docker_warpinfratest/tasks/main.yml
index d6c77f64..9a0e8e93 100644
--- a/webserver/docker_warpinfratest/tasks/main.yml
+++ b/webserver/docker_warpinfratest/tasks/main.yml
@@ -56,10 +56,6 @@
debug:
msg: "{{gitclone}}"
-- name: Get a timestamp
- command: "date +%d.%m.%Y"
- register: timestamp
-
- name: Konfig-Datei erstellen
template:
src: "config.ini"
diff --git a/webserver/docker_warpinfratest/templates/config.ini b/webserver/docker_warpinfratest/templates/config.ini
index b1d150cb..f5a6951f 100644
--- a/webserver/docker_warpinfratest/templates/config.ini
+++ b/webserver/docker_warpinfratest/templates/config.ini
@@ -5,7 +5,7 @@ APPS = warpmain, warpauth, warpfood, warpapi
INSTANCE_NAME = 'EXTERN-TEST'
GIT_COMMIT = '{{ gitclone.after }}'
-DEPLOY_DATE = '{{ timestamp.stdout }}'
+DEPLOY_DATE = '{{ ansible_date_time.date }}--{{ ansible_date_time.hour }}-{{ ansible_date_time.minute }}'
[debug]
DEBUG = True
--
GitLab