Merge pull request 'dev' (#15 ) from dev into test

Reviewed-on: #15
fix(patches): use correct patch file name
2023-06-22 13:54:48 +02:00 · 2023-06-22 13:54:48 +02:00 · 2023-06-22 13:46:02 +02:00 · 2023-06-22 12:12:01 +02:00 · 2023-06-22 12:11:27 +02:00 · 2023-06-22 12:10:46 +02:00
2 changed files with 6 additions and 1 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/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
Author	SHA1	Message	Date
pcaseiro	b14b8e1b9a	Merge pull request 'dev' (#15 ) from dev into test Reviewed-on: #15	2023-06-22 13:54:48 +02:00
Philippe Caseiro	996e4bcde3	fix(patches): use correct patch file name	2023-06-22 13:54:48 +02:00
Philippe Caseiro	b3263f739a	fix(patches): adding missing patch	2023-06-22 13:46:02 +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	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
pcaseiro	96884e4e56	Merge pull request 'dev' (#2 ) from dev into test Reviewed-on: #2	2023-06-22 11:46:33 +02:00