diff --git a/services-user-guide/gitlab/container.psi.ch.md b/services-user-guide/gitlab/container.psi.ch.md index 4497099b..5a0e2b66 100644 --- a/services-user-guide/gitlab/container.psi.ch.md +++ b/services-user-guide/gitlab/container.psi.ch.md @@ -1,3 +1,7 @@ # Container Registry __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}`` diff --git a/services-user-guide/gitlab/git.psi.ch.md b/services-user-guide/gitlab/git.psi.ch.md index 9aa94c8a..9c0befc2 100644 --- a/services-user-guide/gitlab/git.psi.ch.md +++ b/services-user-guide/gitlab/git.psi.ch.md @@ -1,3 +1,21 @@ # Git __Under Construction!__ + +To make a cut between internal development and external colaboration, there is two installations of Gitlab at PSI. + +##### comparison +| Feature | gitlab.psi.ch | git.psi.ch | +| :------ | ------- | ---------------: | +| Container Registry | No | Yes | +| RPM Registry | Yes | Yes | +| Gitpages | No | Yes | +| ACL for Gitpages | No | Yes | +| LFS | Yes | Yes | + + +### 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. + +### 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! diff --git a/services-user-guide/gitlab/gitpages.psi.ch.md b/services-user-guide/gitlab/gitpages.psi.ch.md index 6d44a363..71ae7cec 100644 --- a/services-user-guide/gitlab/gitpages.psi.ch.md +++ b/services-user-guide/gitlab/gitpages.psi.ch.md @@ -1,2 +1,8 @@ # Pages __Under Construction!__ + +Gitpages can be used to display static HTTP content. Per default, gitpages are readable by everyone. You can change this behaviour in your project settings in the general tab under "visibility, project features, permissions" to only allow authenticated users to read your page. + +To make gitpages accessible with a different (more speaking name) one can order a DNS entry in ServiceNow like linux.psi.ch :) + +Gitpages are only available inside the PSI Network and only on git.psi.ch (internal gitlab)