Merge pull request 'test' (#16 ) from test into stable

Reviewed-on: #16
fix(patches): use correct patch file name
2023-06-22 13:55:16 +02:00 · 2023-06-22 13:55:16 +02:00 · 2023-06-22 13:46:39 +02:00 · 2023-06-22 12:12:23 +02:00 · 2023-06-22 12:12:01 +02:00 · 2023-06-22 12:11:27 +02:00
4 changed files with 11 additions and 6 deletions
--- a/3
+++ b/3
@ -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-*')
--- a/misc/k8s/kustomization/base/resources/myapplication-kube/resources/myapplication-deployment.yaml
+++ b/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
--- a/misc/k8s/kustomization/overlays/dev/patches/add-registry-pull-secret.yaml
+++ b/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
--- a/misc/k8s/kustomization/overlays/dev/resources/ingress.yaml
+++ b/misc/k8s/kustomization/overlays/dev/resources/ingress.yaml
@ -18,4 +18,4 @@ spec:
          service:
            name: myapplication
            port:
-              number: 8080
+              number: 80
Author	SHA1	Message	Date
pcaseiro	6ff4c2d834	Merge pull request 'test' (#16 ) from test into stable Reviewed-on: #16	2023-06-22 13:55:16 +02:00
Philippe Caseiro	d550141b92	fix(patches): use correct patch file name	2023-06-22 13:55:16 +02:00
Philippe Caseiro	4f60cdebdb	fix(patches): adding missing patch	2023-06-22 13:46:39 +02:00
pcaseiro	4fbe432ebf	Merge pull request 'test' (#10 ) from test into stable Reviewed-on: #10	2023-06-22 12:12:23 +02:00
pcaseiro	80d03bf7e8	Merge pull request 'dev' (#9 ) from dev into test Reviewed-on: #9	2023-06-22 12:12:01 +02:00
pcaseiro	5eb1f4b610	Merge pull request 'fix(iniapp): using default stable branch' (#8 ) from fix/iniapp into dev Reviewed-on: #8	2023-06-22 12:11:27 +02:00
Philippe Caseiro	0e16682b0f	fix(iniapp): using default stable branch	2023-06-22 12:10:46 +02:00
pcaseiro	a0fe89e310	Merge pull request 'test' (#7 ) from test into stable Reviewed-on: #7	2023-06-22 12:06:32 +02:00
pcaseiro	6015496fa0	Merge pull request 'dev' (#6 ) from dev into test Reviewed-on: #6	2023-06-22 12:06:06 +02:00
pcaseiro	61c8b8d50b	Merge pull request 'fix(k8s): naming variables correctly for nginx container' (#4 ) from fix/nginx into dev Reviewed-on: #4	2023-06-22 12:02:55 +02:00
Philippe Caseiro	8af5526c7a	fix(k8s): naming variables correctly for nginx container	2023-06-22 12:01:48 +02:00
pcaseiro	39f7bc12b5	Merge pull request 'test' (#3 ) from test into stable Reviewed-on: #3	2023-06-22 11:46:59 +02:00
pcaseiro	96884e4e56	Merge pull request 'dev' (#2 ) from dev into test Reviewed-on: #2	2023-06-22 11:46:33 +02:00
pcaseiro	3f098b691a	Merge pull request 'feat(jenkins): adding new default jenkins configuration' (#1 ) from feat/jenkins into dev Reviewed-on: #1	2023-06-22 11:46:05 +02:00