You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: handover/README.md
+35-2Lines changed: 35 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -48,6 +48,10 @@ We have essentially two environments. Once we had a similar environment for pres
48
48
49
49
### Development Environment
50
50
51
+
#### Certificate Management
52
+
53
+
Certificates are stored in
54
+
51
55
#### Deployment
52
56
53
57
The catalog and the did service are deployed via Flux. All other applications are deployed in a similar way using helm charts.
@@ -116,7 +120,36 @@ Now the usual process to update the Piveau UI looks like this:
116
120
* The github workflow builds a new image
117
121
* We reference the new image within the `piveau-ui.yaml`
118
122
119
-
The piveau UI utilizes submodules to reference to the public piveau-ui project. As submodules are rather complicated and error prone, I helped myself with a small workaround: Instead of using the submodule I simply git clone the current state of the project in the correct repository. Up until now this works and it should work in the future as well.ƒ
123
+
The piveau UI utilizes submodules to reference to the public piveau-ui project. As submodules are rather complicated and error prone, I helped myself with a small workaround: Instead of using the submodule I simply git clone the current state of the project in the correct repository. Up until now this works and it should work in the future as well.
124
+
125
+
126
+
TL;DR - this is the simple script:
127
+
128
+
```bash
129
+
git clone https://gitlab.com/piveau/ui/piveau-ui.git # clone this from gitlab - credentials are given from Fraunhofer
130
+
cd piveau-ui
131
+
git remote add github https://github.com/POSSIBLE-X/piveau-ui.git # Add the github remote
132
+
git fetch --all
133
+
git checkout -b develop github/develop # Create a branch develop, that tracks the github branch
134
+
git checkout -b POSSIBLE origin/POSSIBLE # Create a branch develop, that tracks the gitlab branch
135
+
```
136
+
137
+
Now you have a repository with two remotes and two branches. One branch tracks the origin (gitlab) and one github.
138
+
Now you can do
139
+
140
+
```bash
141
+
git checkout POSSIBLE
142
+
git fetch
143
+
git pull
144
+
git checkout develop
145
+
git fetch
146
+
git pull
147
+
git merge POSSIBLE
148
+
git push
149
+
```
150
+
151
+
This will fetch changes from POSSIBLE and merge them into your local develop branch and push them to github
152
+
120
153
121
154
### Integration Environment
122
155
@@ -213,4 +246,4 @@ This could be implemented for example by triggering a git commit on acceptance.
213
246
214
247
The init job of the participant could be enhanced to send the relevant credentials on creation.
215
248
216
-
This approach would utilize the existing infrastructure and still allow for a gitops apprach.
249
+
This approach would utilize the existing infrastructure and still allow for a gitops approach.
0 commit comments