Merge pull request 'fix(patches): use correct patch file name' (#14) from fix/patches into dev

Reviewed-on: #14

init-app

@@ -73,10 +73,11 @@ init_app() {
     return 2
   fi
 
-  git clone --branch "feat/automation" ${SKELL_GIT_URL} ${appDest}
+  git clone ${SKELL_GIT_URL} ${appDest}
 
   cd ${appDest}
   rm -rf .git
+  rm -rf init-app
 
   echo "Setting Dockerfiles"
   dirs=$(find ${DOCKERFILES_ROOT}/* -type d -name 'myapplication-*')

misc/k8s/kustomization/base/resources/myapplication-kube/resources/myapplication-deployment.yaml

@@ -40,15 +40,15 @@ spec:
         name: myapplication-nginx
         args: ["/usr/sbin/nginx"]
         env:
-        - name: NGINX_myapplication_UPSTREAM_BACKEND_SERVER
+        - name: NGINX_APP_UPSTREAM_BACKEND_SERVER
           value: 127.0.0.1:9000
-        - name: NGINX_myapplication_ROOT
+        - name: NGINX_APP_ROOT
           value: "/public"
-        - name: NGINX_myapplication_PHP_INDEX
+        - name: NGINX_APP_PHP_INDEX
           value: "/index.php"
         - name: NGINX_ERROR_LOG_LEVEL
           value: "warn"
-        - name: NGINX_myapplication_PHP_NON_FILE_PATTERN
+        - name: NGINX_APP_PHP_NON_FILE_PATTERN
           value: "^/index\\.php(/|$)"
         ports:
         - containerPort: 8080

misc/k8s/kustomization/overlays/dev/patches/add-registry-pull-secret.yaml

@@ -0,0 +1,4 @@
+- op: add
+  path: "/spec/template/spec/imagePullSecrets"
+  value:
+  - name: regcred-dev

misc/k8s/kustomization/overlays/dev/resources/ingress.yaml

@@ -18,4 +18,4 @@ spec:
           service:
             name: myapplication
             port:
-              number: 8080
+              number: 80