devenv: fix docker blocks paths

7 years ago · 667ca3d54d
parent 28ff8a6716
commit 667ca3d54d
14 changed files with 17 additions and 17 deletions
--- a/devenv/docker/blocks/apache_proxy/docker-compose.yaml
+++ b/devenv/docker/blocks/apache_proxy/docker-compose.yaml
@ -5,5 +5,5 @@
 # root_url = %(protocol)s://%(domain)s:10081/grafana/

  apacheproxy:
-    build: blocks/apache_proxy
+    build: docker/blocks/apache_proxy
    network_mode: host
--- a/devenv/docker/blocks/collectd/docker-compose.yaml
+++ b/devenv/docker/blocks/collectd/docker-compose.yaml
@ -1,5 +1,5 @@
  collectd:
-    build: blocks/collectd
+    build: docker/blocks/collectd
    environment:
      HOST_NAME: myserver
      GRAPHITE_HOST: graphite
--- a/devenv/docker/blocks/graphite/docker-compose.yaml
+++ b/devenv/docker/blocks/graphite/docker-compose.yaml
@ -1,5 +1,5 @@
  graphite09:
-    build: blocks/graphite
+    build: docker/blocks/graphite
    ports:
      - "8080:80"
      - "2003:2003"
--- a/devenv/docker/blocks/graphite1/docker-compose.yaml
+++ b/devenv/docker/blocks/graphite1/docker-compose.yaml
@ -1,6 +1,6 @@
  graphite:
    build:
-      context: blocks/graphite1
+      context: docker/blocks/graphite1
      args:
        version: master
    ports:
--- a/devenv/docker/blocks/mssql/docker-compose.yaml
+++ b/devenv/docker/blocks/mssql/docker-compose.yaml
@ -1,6 +1,6 @@
  mssql:
    build:
-      context: blocks/mssql/build
+      context: docker/blocks/mssql/build
    environment:
      ACCEPT_EULA: Y
      MSSQL_SA_PASSWORD: Password!
--- a/devenv/docker/blocks/mssql_tests/docker-compose.yaml
+++ b/devenv/docker/blocks/mssql_tests/docker-compose.yaml
@ -1,6 +1,6 @@
  mssqltests:
    build:
-      context: blocks/mssql/build
+      context: docker/blocks/mssql/build
    environment:
      ACCEPT_EULA: Y
      MSSQL_SA_PASSWORD: Password!
--- a/devenv/docker/blocks/mysql_opendata/docker-compose.yaml
+++ b/devenv/docker/blocks/mysql_opendata/docker-compose.yaml
@ -1,5 +1,5 @@
  mysql_opendata:
-    build: blocks/mysql_opendata
+    build: docker/blocks/mysql_opendata
    environment:
      MYSQL_ROOT_PASSWORD: rootpass
      MYSQL_DATABASE: testdata
--- a/devenv/docker/blocks/mysql_tests/docker-compose.yaml
+++ b/devenv/docker/blocks/mysql_tests/docker-compose.yaml
@ -1,6 +1,6 @@
  mysqltests:
    build:
-      context: blocks/mysql_tests
+      context: docker/blocks/mysql_tests
    environment:
      MYSQL_ROOT_PASSWORD: rootpass
      MYSQL_DATABASE: grafana_tests
--- a/devenv/docker/blocks/nginx_proxy/docker-compose.yaml
+++ b/devenv/docker/blocks/nginx_proxy/docker-compose.yaml
@ -5,5 +5,5 @@
 # root_url = %(protocol)s://%(domain)s:10080/grafana/

  nginxproxy:
-    build: blocks/nginx_proxy
+    build: docker/blocks/nginx_proxy
    network_mode: host
--- a/devenv/docker/blocks/openldap/docker-compose.yaml
+++ b/devenv/docker/blocks/openldap/docker-compose.yaml
@ -1,5 +1,5 @@
  openldap:
-    build: blocks/openldap
+    build: docker/blocks/openldap
    environment:
      SLAPD_PASSWORD: grafana
      SLAPD_DOMAIN: grafana.org
--- a/devenv/docker/blocks/postgres_tests/docker-compose.yaml
+++ b/devenv/docker/blocks/postgres_tests/docker-compose.yaml
@ -1,6 +1,6 @@
  postgrestest:
    build:
-      context: blocks/postgres_tests
+      context: docker/blocks/postgres_tests
    environment:
      POSTGRES_USER: grafanatest
      POSTGRES_PASSWORD: grafanatest
--- a/devenv/docker/blocks/prometheus/docker-compose.yaml
+++ b/devenv/docker/blocks/prometheus/docker-compose.yaml
@ -1,5 +1,5 @@
  prometheus:
-    build: blocks/prometheus
+    build: docker/blocks/prometheus
    network_mode: host
    ports:
      - "9090:9090"
@ -25,7 +25,7 @@
      - "9093:9093"

  prometheus-random-data:
-    build: blocks/prometheus_random_data
+    build: docker/blocks/prometheus_random_data
    network_mode: host
    ports:
      - "8081:8080"
--- a/devenv/docker/blocks/prometheus2/docker-compose.yaml
+++ b/devenv/docker/blocks/prometheus2/docker-compose.yaml
@ -1,5 +1,5 @@
  prometheus:
-    build: blocks/prometheus2
+    build: docker/blocks/prometheus2
    network_mode: host
    ports:
      - "9090:9090"
@ -25,7 +25,7 @@
      - "9093:9093"

  prometheus-random-data:
-    build: blocks/prometheus_random_data
+    build: docker/blocks/prometheus_random_data
    network_mode: host
    ports:
      - "8081:8080"
--- a/devenv/docker/blocks/prometheus_mac/docker-compose.yaml
+++ b/devenv/docker/blocks/prometheus_mac/docker-compose.yaml
@ -1,5 +1,5 @@
  prometheus:
-    build: blocks/prometheus_mac
+    build: docker/blocks/prometheus_mac
    ports:
      - "9090:9090"

@ -21,6 +21,6 @@
      - "9093:9093"

  prometheus-random-data:
-    build: blocks/prometheus_random_data
+    build: docker/blocks/prometheus_random_data
    ports:
      - "8081:8080"