fixing #13, #14 (#15)

Docker Sync issue (#13) and Toolbox scripts are not called (#14)

Author: Julien Neuhart

.docker/.gitignore

@@ -1,5 +1,4 @@
 docker-compose.yml
 docker-compose-graylog.yml
 docker-compose-proxy.yml
-docker-compose-toolbox.yml
-docker-sync.yml
+docker-compose-toolbox.yml

.docker/.orbit/orbit-build.yml

@@ -25,7 +25,7 @@ commands:
   - use: "toolbox-build"
     run:
       {{- if eq "true" .EnvFiles.Kickoff.ENABLE_DOCKER_SYNC }}
-      - orbit generate -t=.docker/docker-sync.blueprint.yml -o=.docker/docker-sync.yml -v=Kickoff,kickoff.yml -e=Kickoff,.env
+      - orbit generate -t=docker-sync.blueprint.yml -o=docker-sync.yml -v=Kickoff,kickoff.yml -e=Kickoff,.env
       {{- end }}
       - orbit generate -t=.docker/toolbox/Dockerfile.blueprint -o=.docker/toolbox/Dockerfile -v=Kickoff,kickoff.yml -e=Kickoff,.env
       - orbit generate -t=.docker/toolbox/conf.d/memory-limit.blueprint.ini -o=.docker/toolbox/conf.d/memory-limit.ini -v=Kickoff,kickoff.yml -e=Kickoff,.env

.docker/.orbit/orbit-down.yml

@@ -24,7 +24,7 @@ commands:
   - use: "toolbox-down"
     run:
       {{- if eq "true" .EnvFiles.Kickoff.ENABLE_DOCKER_SYNC }}
-      - docker-sync stop -c=.docker/docker-sync.yml
+      - docker-sync stop -c=docker-sync.yml
       {{- end }}
       - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose-toolbox.yml down
 

.docker/.orbit/orbit-up.yml

@@ -24,9 +24,13 @@ commands:
   - use: "toolbox-up"
     run:
       {{- if eq "true" .EnvFiles.Kickoff.ENABLE_DOCKER_SYNC }}
-      - docker-sync start -c=.docker/docker-sync.yml
+      - docker-sync start -c=docker-sync.yml
       {{- end }}
       - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose-toolbox.yml up -d
+      - orbit run traefik-self-signed-certificate -c=.docker/.orbit/orbit-docker-commands.yml -v=Kickoff,kickoff.yml -e=Kickoff,.env -s
+      - orbit run traefik-htdigest -c=.docker/.orbit/orbit-docker-commands.yml -v=Kickoff,kickoff.yml -e=Kickoff,.env -s
+      - orbit run graylog-passwords -c=.docker/.orbit/orbit-docker-commands.yml -v=Kickoff,kickoff.yml -e=Kickoff,.env -s
+
 
   # |--------------------------------------------------------------------------
   # | orbit run proxy-up

.docker/docker-compose-toolbox.blueprint.yml

@@ -30,7 +30,7 @@ services:
       - traefik.enable=false
     volumes:
       {{- if eq "true" .EnvFiles.Kickoff.ENABLE_DOCKER_SYNC }}
-      - sync_{{ .EnvFiles.Kickoff.ENV }}_{{ .Values.Kickoff.project.name }}_app:/var/www/html:nocopy
+      - {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }}_sync_app:/var/www/html:nocopy
       {{- else }}
       - ../app:/var/www/html:{{ if eq "darwin" .Os }}cached{{ else }}ro{{ end }}
       {{- end }}
@@ -49,6 +49,6 @@ networks:
 volumes:
 
 
-  sync_{{ .EnvFiles.Kickoff.ENV }}_{{ .Values.Kickoff.project.name }}_app:
+  {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }}_sync_app:
     external: true
 {{- end }}

.docker/docker-compose.blueprint.yml

@@ -24,7 +24,7 @@ services:
       - backend
     volumes:
       {{- if eq "true" .EnvFiles.Kickoff.ENABLE_DOCKER_SYNC }}
-      - sync_{{ .EnvFiles.Kickoff.ENV }}_{{ .Values.Kickoff.project.name }}_app:/var/www/html:nocopy
+      - {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }}_sync_app:/var/www/html:nocopy
       {{- else }}
       - ../app:/var/www/html:{{ if eq "darwin" .Os }}cached{{ else }}ro{{ end }}
       {{- end }}
@@ -48,7 +48,7 @@ services:
       - traefik.enable=false
     volumes:
       {{- if eq "true" .EnvFiles.Kickoff.ENABLE_DOCKER_SYNC }}
-      - sync_{{ .EnvFiles.Kickoff.ENV }}_{{ .Values.Kickoff.project.name }}_app:/var/www/html:nocopy
+      - {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }}_sync_app:/var/www/html:nocopy
       {{- else }}
       - ../app:/var/www/html:{{ if eq "darwin" .Os }}cached{{ else }}ro{{ end }}
       {{- end }}
@@ -207,6 +207,6 @@ volumes:
     driver: local
   {{ end }}
   {{ if eq "true" .EnvFiles.Kickoff.ENABLE_DOCKER_SYNC }}
-  sync_{{ .EnvFiles.Kickoff.ENV }}_{{ .Values.Kickoff.project.name }}_app:
+  {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }}_sync_app:
     external: true
   {{- end }}

.gitignore

@@ -1,3 +1,4 @@
 .env
 .docker-sync
-.idea
+.idea
+docker-sync.yml

.docker/docker-sync.blueprint.yml renamed to docker-sync.blueprint.yml

@@ -4,6 +4,6 @@ options:
   verbose: false
 
 syncs:
-  sync_{{ .EnvFiles.Kickoff.ENV }}_{{ .Values.Kickoff.project.name }}_app:
-    src: '../app'
+  {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }}_sync_app:
+    src: './app/'
     sync_strategy: {{ if eq "darwin" .Os }}'native_osx'{{ else }}'unison'{{ end }}