moves docker/ to devenv/docker

.circleci/config.yml

@@ -32,7 +32,7 @@ jobs:
         - run: sudo apt update
         - run: sudo apt install -y mysql-client
         - run: dockerize -wait tcp://127.0.0.1:3306 -timeout 120s
-        - run: cat docker/blocks/mysql_tests/setup.sql | mysql -h 127.0.0.1 -P 3306 -u root -prootpass
+        - run: cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h 127.0.0.1 -P 3306 -u root -prootpass
         - run:
             name: mysql integration tests
             command: 'GRAFANA_TEST_DB=mysql go test ./pkg/services/sqlstore/... ./pkg/tsdb/mysql/... '
@@ -51,7 +51,7 @@ jobs:
         - run: sudo apt update
         - run: sudo apt install -y postgresql-client
         - run: dockerize -wait tcp://127.0.0.1:5432 -timeout 120s
-        - run: 'PGPASSWORD=grafanatest psql -p 5432 -h 127.0.0.1 -U grafanatest -d grafanatest -f docker/blocks/postgres_tests/setup.sql'
+        - run: 'PGPASSWORD=grafanatest psql -p 5432 -h 127.0.0.1 -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql'
         - run:
             name: postgres integration tests
             command: 'GRAFANA_TEST_DB=postgres go test ./pkg/services/sqlstore/... ./pkg/tsdb/postgres/...'

docker/create_docker_compose.sh → devenv/create_docker_compose.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
-blocks_dir=blocks
+blocks_dir=docker/blocks
 docker_dir=docker
 template_dir=templates
 
 grafana_config_file=conf.tmp
 grafana_config=config
 
-compose_header_file=compose_header.yml
+compose_header_file=docker/compose_header.yml
 fig_file=docker-compose.yaml
 fig_config=docker-compose.yaml
 

docker/blocks/apache_proxy/docker-compose.yaml

@@ -1,9 +0,0 @@
-# This will proxy all requests for http://localhost:10081/grafana/ to
-# http://localhost:3000 (Grafana running locally)
-#
-# Please note that you'll need to change the root_url in the Grafana configuration:
-# root_url = %(protocol)s://%(domain)s:10081/grafana/
-
-  apacheproxy:
-    build: blocks/apache_proxy
-    network_mode: host

docker/blocks/collectd/docker-compose.yaml

@@ -1,11 +0,0 @@
-  collectd:
-    build: blocks/collectd
-    environment:
-      HOST_NAME: myserver
-      GRAPHITE_HOST: graphite
-      GRAPHITE_PORT: 2003
-      GRAPHITE_PREFIX: collectd.
-      REPORT_BY_CPU: 'false'
-      COLLECT_INTERVAL: 10
-    links:
-      - graphite

docker/blocks/elastic/docker-compose.yaml

@@ -1,15 +0,0 @@
-  elasticsearch:
-    image: elasticsearch:2.4.1
-    command: elasticsearch -Des.network.host=0.0.0.0
-    ports:
-      - "9200:9200"
-      - "9300:9300"
-    volumes:
-      - ./blocks/elastic/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
-
-  fake-elastic-data:
-    image: grafana/fake-data-gen
-    network_mode: bridge
-    environment:
-      FD_DATASOURCE: elasticsearch
-      FD_PORT: 9200