[icinga-checkins] icinga.org: icingaweb2-module-elasticsearch/master: Update docker test environment

git at icinga.org git at icinga.org
Thu Jun 30 17:12:09 CEST 2016


Module: icingaweb2-module-elasticsearch
Branch: master
Commit: 51c65b519c3cc3e402da6de65a83ba31ee4a496f
URL:    https://git.icinga.org/?p=icingaweb2-module-elasticsearch.git;a=commit;h=51c65b519c3cc3e402da6de65a83ba31ee4a496f

Author: Markus Frosch <lazyfrosch at icinga.org>
Date:   Thu Jun 30 17:12:05 2016 +0200

Update docker test environment

refs #11519

---

 docker-compose.yml    |   13 +++++++++++--
 docker/web/Dockerfile |    3 ---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ea41f56..1d5ed52 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,13 @@
 ---
+db:
+  image: mariadb
+  volumes:
+    - ./docker/data/mysql/db:/var/lib/mysql
+  environment:
+    MYSQL_ROOT_PASSWORD: onlyforadmin
+    MYSQL_DATABASE: icingaweb2
+    MYSQL_USER: icingaweb2
+    MYSQL_PASSWORD: rosebud
 elasticsearch:
   image: elasticsearch:2.3
   volumes:
@@ -27,8 +36,7 @@ logstash:
     - /etc/timezone:/etc/timezone:ro
   command: logstash -f /config/logstash-syslog.conf
 web:
-  #image: lazyfrosch/icingaweb2
-  build: docker/web/
+  image: lazyfrosch/icingaweb2:dev
   ports:
     - "8080:80"
   volumes:
@@ -36,3 +44,4 @@ web:
     - ".:/usr/share/icingaweb2/modules/elasticsearch"
   links:
     - elasticsearch
+    - db
diff --git a/docker/web/Dockerfile b/docker/web/Dockerfile
deleted file mode 100644
index 3a9ed46..0000000
--- a/docker/web/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM lazyfrosch/icingaweb2
-
-RUN echo "SetEnv REMOTE_USER icingaadmin" > /etc/apache2/conf-enabled/dev.conf
\ No newline at end of file



More information about the icinga-checkins mailing list