Fix Docker Quickstart configuration paths (gravitational#4116)

Somith11 · Jul 24, 2020 · a1ac0ec · a1ac0ec
1 parent 1077ceb
commit a1ac0ec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/docker/teleport-ent-quickstart.yml b/docker/teleport-ent-quickstart.yml
@@ -7,7 +7,7 @@ services:
     container_name: teleport-configure
     entrypoint: /bin/sh
     hostname: localhost
-    command: -c "if [ ! -f /etc/teleport/teleport.yaml ]; then /usr/local/bin/teleport configure > /etc/teleport/teleport.yaml; fi"
+    command: -c "if [ ! -f /etc/teleport/teleport.yaml ]; then teleport configure > /etc/teleport/teleport.yaml; fi"
     volumes:
       - ./teleport/config:/etc/teleport
 
@@ -18,7 +18,7 @@ services:
     container_name: teleport
     entrypoint: /bin/sh
     hostname: localhost
-    command: -c "sleep 1 && /usr/local/bin/teleport start"
+    command: -c "sleep 1 && /usr/local/bin/dumb-init teleport start -c /etc/teleport/teleport.yaml"
     ports:
       - "3023:3023"
       - "3025:3025"

diff --git a/docker/teleport-quickstart.yml b/docker/teleport-quickstart.yml
@@ -7,7 +7,7 @@ services:
     container_name: teleport-configure
     entrypoint: /bin/sh
     hostname: localhost
-    command: -c "if [ ! -f /etc/teleport/teleport.yaml ]; then /usr/local/bin/teleport configure > /etc/teleport/teleport.yaml; fi"
+    command: -c "if [ ! -f /etc/teleport/teleport.yaml ]; then teleport configure > /etc/teleport/teleport.yaml; fi"
     volumes:
       - ./teleport/config:/etc/teleport
 
@@ -18,7 +18,7 @@ services:
     container_name: teleport
     entrypoint: /bin/sh
     hostname: localhost
-    command: -c "sleep 1 && /usr/local/bin/teleport start"
+    command: -c "sleep 1 && /usr/local/bin/dumb-init teleport start -c /etc/teleport/teleport.yaml"
     ports:
       - "3023:3023"
       - "3025:3025"