From 7ca29dfce0cedf51ff47da24c813c9b9984dddbc Mon Sep 17 00:00:00 2001 From: Pierre Belloy Date: Wed, 25 Sep 2019 14:50:44 +0200 Subject: [PATCH] Use updated gitlab-ce repository name `gitlab-foss` Gitlab is moving to a single codebase for GitLab Community and Enterprise editions. All code and development is moved into the gitlab-ee repository. The code of the gitlab-ce repository remains as is, and won't include any proprietary code. The `gitlab-ce` repository is renamed to `gitlab-foss` See https://about.gitlab.com/2019/08/23/a-single-codebase-for-gitlab-community-and-enterprise-edition/ Signed-off-by: Pierre Belloy --- Changelog.md | 6 +++--- README.md | 8 ++++---- assets/build/install.sh | 6 +++--- assets/runtime/config/nginx/gitlab-registry | 2 +- docs/container_registry.md | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Changelog.md b/Changelog.md index 014d62e0..ce86a709 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,7 +1,7 @@ # Changelog This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( -https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab. +https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. **12.3.1** - gitlab: upgrade CE to v12.3.1 @@ -42,7 +42,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **12.1.0** - gitlab: upgrade CE to v12.1.0 -- Removed MySQL related information and packages. GitLab v12.1.X or greater requires only PostgreSQL. Do an Migration before upgrading to v12.1.X. For more Information have a look at the [Migration Guide](https://docs.gitlab.com/ce/update/mysql_to_postgresql.html) +- Removed MySQL related information and packages. GitLab v12.1.X or greater requires only PostgreSQL. Do an Migration before upgrading to v12.1.X. For more Information have a look at the [Migration Guide](https://docs.gitlab.com/ce/update/mysql_to_postgresql.html) **12.0.4** - gitlab: upgrade CE to v12.0.4 @@ -569,7 +569,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **9.3.8** - gitlab: upgrade to CE v9.3.8 -- Added RE2 library to build dependencies ([issue 35342](https://gitlab.com/gitlab-org/gitlab-ce/issues/35342)) +- Added RE2 library to build dependencies ([issue 35342](https://gitlab.com/gitlab-org/gitlab-foss/issues/35342)) **9.3.7** - gitlab: upgrade to CE v9.3.7 diff --git a/README.md b/README.md index f0240d49..16dec1e3 100644 --- a/README.md +++ b/README.md @@ -69,9 +69,9 @@ Dockerfile to build a [GitLab](https://about.gitlab.com/) image for the [Docker](https://www.docker.com/products/docker-engine) opensource container platform. -GitLab CE is set up in the Docker image using the [install from source](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md) method as documented in the the official GitLab documentation. +GitLab CE is set up in the Docker image using the [install from source](https://docs.gitlab.com/ce/install/installation.html) method as documented in the the official GitLab documentation. -For other methods to install GitLab please refer to the [Official GitLab Installation Guide](https://about.gitlab.com/installation/) which includes a [GitLab image for Docker](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/docker). +For other methods to install GitLab please refer to the [Official GitLab Installation Guide](https://about.gitlab.com/install/) which includes a [GitLab image for Docker](https://docs.gitlab.com/omnibus/docker/). # Contributing @@ -528,8 +528,8 @@ This is simply done by adding the servers certificate into their list of trusted Again, this is a client side configuration which means that everyone who is going to communicate with the server should perform this configuration on their machine. In short, distribute the `gitlab.crt` file among your developers and ask them to add it to their list of trusted ssl certificates. Failure to do so will result in errors that look like this: ```bash -git clone https://git.local.host/gitlab-ce.git -fatal: unable to access 'https://git.local.host/gitlab-ce.git': server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none +git clone https://git.local.host/gitlab-foss.git +fatal: unable to access 'https://git.local.host/gitlab-foss.git': server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none ``` You can do the same at the web browser. Instructions for installing the root certificate for firefox can be found [here](http://portal.threatpulse.com/docs/sol/Content/03Solutions/ManagePolicy/SSL/ssl_firefox_cert_ta.htm). You will find similar options chrome, just make sure you install the certificate under the authorities tab of the certificate manager dialog. diff --git a/assets/build/install.sh b/assets/build/install.sh index 734432f0..b69018d6 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -GITLAB_CLONE_URL=https://gitlab.com/gitlab-org/gitlab-ce.git +GITLAB_CLONE_URL=https://gitlab.com/gitlab-org/gitlab-foss.git GITLAB_SHELL_URL=https://gitlab.com/gitlab-org/gitlab-shell/-/archive/v${GITLAB_SHELL_VERSION}/gitlab-shell-v${GITLAB_SHELL_VERSION}.tar.bz2 GITLAB_WORKHORSE_URL=https://gitlab.com/gitlab-org/gitlab-workhorse.git GITLAB_PAGES_URL=https://gitlab.com/gitlab-org/gitlab-pages.git @@ -65,8 +65,8 @@ exec_as_git git config --global repack.writeBitmaps true exec_as_git git config --global receive.advertisePushOptions true -# shallow clone gitlab-ce -echo "Cloning gitlab-ce v.${GITLAB_VERSION}..." +# shallow clone gitlab-foss +echo "Cloning gitlab-foss v.${GITLAB_VERSION}..." exec_as_git git clone -q -b v${GITLAB_VERSION} --depth 1 ${GITLAB_CLONE_URL} ${GITLAB_INSTALL_DIR} GITLAB_SHELL_VERSION=${GITLAB_SHELL_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_SHELL_VERSION)} diff --git a/assets/runtime/config/nginx/gitlab-registry b/assets/runtime/config/nginx/gitlab-registry index 0aa1cc30..f973d39d 100644 --- a/assets/runtime/config/nginx/gitlab-registry +++ b/assets/runtime/config/nginx/gitlab-registry @@ -16,7 +16,7 @@ server { } server { - # If a different port is specified in https://gitlab.com/gitlab-org/gitlab-ce/blob/8-8-stable/config/gitlab.yml.example#L182, + # If a different port is specified in https://gitlab.com/gitlab-org/gitlab-foss/blob/8-8-stable/config/gitlab.yml.example#L182, # it should be declared here as well listen *:{{GITLAB_REGISTRY_PORT}} ssl http2; server_name {{GITLAB_REGISTRY_HOST}}; diff --git a/docs/container_registry.md b/docs/container_registry.md index e38cb659..66af974a 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -378,9 +378,9 @@ sameersbn/gitlab:12.3.1 [wildcard certificate]: https://en.wikipedia.org/wiki/Wildcard_certificate -[ce-4040]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4040 +[ce-4040]: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/4040 [docker-insecure]: https://docs.docker.com/registry/insecure/ [registry-deploy]: https://docs.docker.com/registry/deploying/ [storage-config]: https://docs.docker.com/registry/configuration/#storage [token-config]: https://docs.docker.com/registry/configuration/#token -[8-8-docs]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-8-stable/doc/administration/container_registry.md +[8-8-docs]: https://gitlab.com/gitlab-org/gitlab-foss/blob/8-8-stable/doc/administration/container_registry.md