Merge pull request #40 from vapor-ware/dockerfiles

Moving dockerfiles to match context
vapor-ware · May 1, 2017 · fa86e7f · fa86e7f
2 parents ab57ce2 + 0a0b5b4
commit fa86e7f
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 105 deletions.
diff --git a/dockerfile/Dockerfile.x64 → Dockerfile.x64 b/dockerfile/Dockerfile.x64 → Dockerfile.x64
diff --git a/compose/release.yml b/compose/release.yml
@@ -4,10 +4,9 @@ services:
     container_name: synse-server
     build:
       context: ..
-      dockerfile: dockerfile/Dockerfile.x64
+      dockerfile: Dockerfile.x64
 
     ports:
       - 5000:5000
     environment:
       - VAPOR_DEBUG=true
-
diff --git a/dockerfile/Dockerfile.arm64 b/dockerfile/Dockerfile.arm64
diff --git a/dockerfile/Dockerfile.rpi b/dockerfile/Dockerfile.rpi
diff --git a/graphql/compose/release.yml b/graphql/compose/release.yml
@@ -5,6 +5,6 @@ services:
     image: vaporio/synse_graphql
     build:
       context: ..
-      dockerfile: dockerfile/release.dockerfile
+      dockerfile: release.dockerfile
     ports:
       - "5001:5001"
diff --git a/graphql/compose/test.yml b/graphql/compose/test.yml
@@ -5,7 +5,7 @@ services:
     image: vaporio/synse-graphql-test
     build:
       context: ..
-      dockerfile: dockerfile/test.dockerfile
+      dockerfile: test.dockerfile
     volumes:
       - ..:/graphql_frontend
     links:

diff --git a/graphql/dockerfile/release.dockerfile → graphql/release.dockerfile b/graphql/dockerfile/release.dockerfile → graphql/release.dockerfile
diff --git a/graphql/dockerfile/test.dockerfile → graphql/test.dockerfile b/graphql/dockerfile/test.dockerfile → graphql/test.dockerfile