Merge branch 'master' of https://git.willaspace.com/external-projects/cssd-back

.drone.yml

@@ -13,7 +13,7 @@ steps:
       - git clone $DRONE_GIT_HTTP_URL .
       - git checkout $DRONE_COMMIT
   - name: Build docker image
-    image: docker-proxy.willaspace.com/plugins/docker
+    image: docker.willaspace.com/repository/docker-hosted/plugins/docker
     environment:
       REGISTRY_USER_NAME:
         from_secret: registry_username
@@ -40,7 +40,7 @@ steps:
         - push
 
   - name: Build docker nginx image
-    image: docker-proxy.willaspace.com/plugins/docker
+    image: docker.willaspace.com/repository/docker-hosted/plugins/docker
     settings:
       tags:
         - nginx-latest
@@ -59,7 +59,7 @@ steps:
         - push
 
   - name: deploy
-    image: docker-proxy.willaspace.com/pelotech/drone-helm3:latest
+    image: docker.willaspace.com/repository/docker-hosted/pelotech/drone-helm3:latest
     environment:
       USERNAME:
         from_secret: registry_username
@@ -83,6 +83,7 @@ steps:
       values:
         - deployment.image.tag=nginx-$DRONE_BUILD_NUMBER
         - deployment.additionalContainers[0].image=docker.willaspace.com/repository/docker-hosted/external-projects/cssd-back:$DRONE_BUILD_NUMBER
+        - deployment.initContainers.init-artisan.image=docker.willaspace.com/repository/docker-hosted/external-projects/cssd-back:$DRONE_BUILD_NUMBER
       timeout: 3000
     when:
       branch:

.values.yaml

@@ -72,12 +72,20 @@ deployment:
   #   - "foo.remote"
   #   - "bar.remote"
 
-  # Init containers which runs before the app container
+    # Init containers which runs before the app container
   initContainers:
-  #      init-contaner:
+    init-artisan:
-  #        image: busybox
+      args:
-  #        imagePullPolicy: IfNotPresent
+        - /bin/bash
-  #        command: ['/bin/sh']
+        - -c
+        - (php artisan migrate --force || true) && (php artisan config:cache || true)
+      envFrom:
+        - configMapRef:
+            name: cssd-production-back-configmap
+        - secretRef:
+            name: cssd-production-back-secret
+      image: docker.willaspace.com/repository/docker-hosted/external-projects/cssd-back:latest
+      imagePullPolicy: IfNotPresent
 
   # Additional labels for Deployment
   additionalLabels:

resources/js/show/views/Home/Intro.vue

@@ -4,8 +4,8 @@
       <v-toolbar-title >CSSD-DOC</v-toolbar-title>
       <v-spacer></v-spacer>
       <div class="my-2">
-        <a href="/dashboard" v-if="auth"><v-btn color="black">Dashboard</v-btn></a>
+        <a href="https://app.cssd-doc.com/dashboard" v-if="auth"><v-btn color="black">Dashboard</v-btn></a>
-        <a href="/login" v-else><v-btn color="black">Login</v-btn></a>
+        <a href="https://app.cssd-doc.com/login" v-else><v-btn color="black">Login</v-btn></a>
       </div>
     </v-toolbar>
     <v-parallax src="img/Static/Intro/bg.jpg" height="600">