From 703e0f4bee3f8b7a1f2eaf231864042ba4e61a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6nig?= <alexander.koenig@eurac.edu>
Date: Mon, 1 Jul 2019 15:46:24 +0200
Subject: [PATCH] Update DEPLOYMENT.md
---
DEPLOYMENT.md | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md
index c58e30c..448338d 100644
--- a/DEPLOYMENT.md
+++ b/DEPLOYMENT.md
@@ -10,15 +10,16 @@
- [ ] `git checkout -b v$VERSION_NUMBER $HASHID -- .`
The $HASHID being the commit were the last merge from stable happened (before clarindev2clarin.sh changes were committed)
- [ ] `git merge --no-ff stable`
-- [ ] resolve conflicts and commit
+- [ ] resolve conflicts (though there shouldn't be any) and commit
- [ ] Change the version number and the registry branch of the images in all deployment yaml files
- [ ] Run the clarindev2clarin.sh script
- [ ] `git commit -a `
- [ ] `git checkout production`
- [ ] `git merge v1.3-$VERSION_NUMBER`
- [ ] resolve conflicts and commit
-- [ ] `git tag -a $VERSION_NUMBER -s -u $GPG_ID_HASH`
-- [ ] `git push --all
+- [ ] `git tag -a $VERSION_NUMBER -s (-u $GPG_ID_HASH)` defaults to your default GPG key
+- [ ] `git branch -d $VERSION_NUMBER`
+- [ ] `git push --all`
- [ ] `git push --tags`
- [ ] `cd dockerfiles`
- [ ] `./release.sh $VERSION_NUMBER production`
--
GitLab