move build defs to dev compose file

google · Jan 16, 2020 · 387e169 · 387e169
1 parent 2dd8e99
commit 387e169
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -8,3 +8,33 @@ services:
     - "3306:3306"
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+
+  prometheus:
+    image: gcr.io/key-transparency/prometheus:${TRAVIS_COMMIT}
+    build:
+      context: .
+      dockerfile: deploy/prometheus/Dockerfile
+
+  server:
+    image: gcr.io/key-transparency/keytransparency-server:${TRAVIS_COMMIT}
+    build:
+      context: .
+      dockerfile: ./cmd/keytransparency-server/Dockerfile
+
+  sequencer:
+    image: gcr.io/key-transparency/keytransparency-sequencer:${TRAVIS_COMMIT}
+    build:
+      context: .
+      dockerfile: ./cmd/keytransparency-sequencer/Dockerfile
+
+  init:
+    image: gcr.io/key-transparency/init:${TRAVIS_COMMIT}
+    build:
+      context: .
+      dockerfile: ./deploy/docker/init/Dockerfile
+
+  monitor:
+    image: gcr.io/key-transparency/keytransparency-monitor:${TRAVIS_COMMIT}
+    build:
+      context: .
+      dockerfile: ./cmd/keytransparency-monitor/Dockerfile
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,9 +13,6 @@ services:
       - server
       - sequencer
     image: gcr.io/key-transparency/prometheus:${TRAVIS_COMMIT}
-    build:
-      context: .
-      dockerfile: deploy/prometheus/Dockerfile
     restart: always
     ports:
       - 9090:9090
@@ -81,9 +78,6 @@ services:
       - log-server
       - map-server
     image: gcr.io/key-transparency/keytransparency-server:${TRAVIS_COMMIT}
-    build:
-      context: .
-      dockerfile: ./cmd/keytransparency-server/Dockerfile
     restart: always
     ports:
       - "443:8080" # json & grpc
@@ -110,9 +104,6 @@ services:
       - log-server
       - map-server
     image: gcr.io/key-transparency/keytransparency-sequencer:${TRAVIS_COMMIT}
-    build:
-      context: .
-      dockerfile: ./cmd/keytransparency-sequencer/Dockerfile
     restart: always
     command:
       - --force_master
@@ -155,9 +146,6 @@ services:
       - server
       - sequencer
     image: gcr.io/key-transparency/keytransparency-monitor:${TRAVIS_COMMIT}
-    build:
-      context: .
-      dockerfile: ./cmd/keytransparency-monitor/Dockerfile
     command:
       - --addr=0.0.0.0:8099
       - --kt-url=server:8080