diff --git a/services-user-guide/gitlab/container.psi.ch.md b/services-user-guide/gitlab/container.psi.ch.md index 5a0e2b66..c6826fa8 100644 --- a/services-user-guide/gitlab/container.psi.ch.md +++ b/services-user-guide/gitlab/container.psi.ch.md @@ -5,3 +5,5 @@ __Under Construction!__ The container registry is available under container.psi.ch. To push a container to the registry you need to tag it accordingly. ``docker tag {MYCONTAINER} container.psi.ch/{NAMESPACE}/{REPOSITORY}:{TAG}`` + +The container registry is only available inside the PSI-Network. \ No newline at end of file diff --git a/services-user-guide/gitlab/git.psi.ch.md b/services-user-guide/gitlab/git.psi.ch.md index 9c0befc2..614445f8 100644 --- a/services-user-guide/gitlab/git.psi.ch.md +++ b/services-user-guide/gitlab/git.psi.ch.md @@ -1,8 +1,9 @@ -# Git +# General Information and Guideline __Under Construction!__ To make a cut between internal development and external colaboration, there is two installations of Gitlab at PSI. +For convenience reasons, we speak of Gitlab. If the information is specific to one instance it will be called by its URL. ##### comparison | Feature | gitlab.psi.ch | git.psi.ch | @@ -12,10 +13,18 @@ To make a cut between internal development and external colaboration, there is t | Gitpages | No | Yes | | ACL for Gitpages | No | Yes | | LFS | Yes | Yes | +| Public accessible | Yes | No | +### User Management +Every PSI User is allowed to login to Gitlab, to work with non PSI Users, these must first be registered in AD. This can be done in [SNOW](https://intranet.psi.ch/en/computing/request-accounts-for-external-collaborators) (Beware Page is a little out of date) +The user must have logged in first to Gitlab that it can be added to any group or project. +Make sure to upload an SSH public key to your Gitlab profile to be able to push and pull code with SSH. -### gitlab.psi.ch -This is the installation which is reachable from the Internet for everyone. Login is only allowed with a PSI login and can be ordered in [SNOW](https://intranet.psi.ch/en/computing/request-accounts-for-external-collaborators). The user must login to Gitlab first, until then he stays invisible to the permission manager. +Sign-up and local Users are disabled. -### git.psi.ch -Every PSI User which is listed in SAP, is eligible to login to git.psi.ch. There is no way to colab with non Internal PSI Users whatsoever! +### Runners +There are 2 shared Gitlab runners to use, if you want to use deticated runners, these must be registered first and the option to use shared runners disabled in the project options. +Runners are in the responsability of the owner, if there are any changes, we will inform the users accordingly. + +### Availability +There is no SLA on Gitlab, but we do our best to have it available like other linux services during office hours.