Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
themr0c authored Feb 11, 2021
2 parents bc2592e + 338741c commit 5451889
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This Workflow performs a release of che docs
name: Release Che Dashboard
name: Release Che Docs
on:
workflow_dispatch:
inputs:
Expand Down
8 changes: 4 additions & 4 deletions make-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
# set to 1 to actually trigger changes in the release branch
TAG_RELEASE=0
docommit=1 # by default DO commit the change
[email protected]:eclipse/che-docs

while [[ "$#" -gt 0 ]]; do
case $1 in
'-t'|'--trigger-release') TAG_RELEASE=1; docommit=1; shift 0;;
'-r'|'--repo') REPO="$2"; shift 1;;
'-v'|'--version') VERSION="$2"; shift 1;;
'-n'|'--nocommit'|'--no-commit') docommit=0; shift 0;;
esac
Expand All @@ -20,16 +20,16 @@ done
usage ()
{
echo "
Usage: $0 --repo [GIT REPO TO EDIT] --version [VERSION TO RELEASE]
Example: $0 --repo [email protected]:eclipse/che-docs --version 7.25.2
Usage: $0 --version [VERSION TO RELEASE]
Example: $0 --version 7.25.2 -t
Options:
--trigger-release, -t tag this release
--no-commit, -n do not commit changes to branches
"
}

if [[ ! ${VERSION} ]] || [[ ! ${REPO} ]]; then
if [[ ! ${VERSION} ]]; then
usage
exit 1
else # clone into a temp folder so we don't collide with local changes to this script
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,24 @@ The main parts of the secret are:

|===

Bitbucket user id can be obtained with call to REST API:
NOTE: Encoding a string into the base64 format using the `base64` tool on Linux machines leads to adding the newline character to the end of the source string and causing a value to be unusable as the authentication header value after decoding. Avoid this by using `base64 -w0`, which removes newly added lines, or strip newlines explicitly using`tr -d \\n`.

. To obtain a user ID from a secret using a call to a REST API URL:
* For Bitbucket:
+
[subs="+quotes"]
----
https://{bitbucket-hostname}/rest/api/1.0/users/{username}
https://__<bitbucket-hostname>__/rest/api/1.0/users/__<username>__
----

and for {prod} the user API URL is
* For {prod-short}
+
[subs="+attributes,+quotes"]
----
https://{che-hostname}/api/user
----

Using the token credential provided in this secret, another one is automatically created to allow authorized Git operations. It will be mount
into workspace containers as Git credentials file. Users don't have to perform any additional configurations to be able to work
with private Git repositories.
* With the token credentials obtained from a secret, another secret is automatically created, allowing authorization to Git operations. This secret is mounted into a workspace container as a Git credentials file, and any additional configurations are not required to work with private Git repositories.

* When a remote Git repository uses a self-signed certificate, add an additional server configuration. See:
xref:installation-guide:deploying-che-with-support-for-git-repositories-with-self-signed-certificates.adoc[].
Original file line number Diff line number Diff line change
Expand Up @@ -244,4 +244,3 @@ $ {orch-cli} exec __<workspace pod name>__ -c __<theia ide container name>__ -n
ca-bundle.crt
source-config-map-name.data-key.crt
----
+

0 comments on commit 5451889

Please sign in to comment.