Merge pull request #946 from hangyan/fix-build-path

Fix image build path error
2018-02-27 10:09:45 -05:00
parent 0f79b58bba e119b30ebd
commit 47a8bfc0ea
7 changed files with 43 additions and 9 deletions
@@ -0,0 +1,24 @@
+version: '3'
+
+services:
+  backend-server:
+    image: "172.30.1.1:5000/myproject/test-image"
+    build:
+      context: ../server
+      dockerfile: Dockerfile
+    env_file:
+      - ../docker_env.list
+    ports:
+      - 5000:4000
+
+  front-end:
+    image: "172.30.1.1:5000/myproject/test-image"
+    build:
+      context: ../web
+      dockerfile: Dockerfile
+    env_file:
+      - ../docker_env.list
+    ports:
+      - 8080:8080
+    depends_on:
+      - backend-server
@@ -0,0 +1 @@
+FOO=BAR
@@ -0,0 +1,3 @@
+FROM busybox:1.26.2
+
+RUN touch /test
@@ -0,0 +1,3 @@
+FROM busybox:1.26.2
+
+RUN touch /test
@@ -24,3 +24,7 @@ convert::print_msg "Running tests for build+push"
 docker_compose_file="${KOMPOSE_ROOT}/script/test_in_openshift/compose-files/buildconfig/docker-compose-build-image.yml"
 convert::kompose_up $docker_compose_file
 convert::kompose_down $docker_compose_file
+
+docker_compose_file="${KOMPOSE_ROOT}/script/test_in_openshift/compose-files/buildconfig-relative-dirs/docker/docker-compose-build-image.yml"
+convert::kompose_up $docker_compose_file
+convert::kompose_down $docker_compose_file