Skip to content

Commit 7ca29df

Browse files
pbe-axelorsolidnerd
authored andcommitted
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 <p.belloy@axelor.com>
1 parent db5a973 commit 7ca29df

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

Changelog.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Changelog
22

33
This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
4-
https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
4+
https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
55

66
**12.3.1**
77
- 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
4242

4343
**12.1.0**
4444
- gitlab: upgrade CE to v12.1.0
45-
- 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)
45+
- 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)
4646

4747
**12.0.4**
4848
- 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
569569

570570
**9.3.8**
571571
- gitlab: upgrade to CE v9.3.8
572-
- Added RE2 library to build dependencies ([issue 35342](https://gitlab.com/gitlab-org/gitlab-ce/issues/35342))
572+
- Added RE2 library to build dependencies ([issue 35342](https://gitlab.com/gitlab-org/gitlab-foss/issues/35342))
573573

574574
**9.3.7**
575575
- gitlab: upgrade to CE v9.3.7

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@
6969

7070
Dockerfile to build a [GitLab](https://about.gitlab.com/) image for the [Docker](https://www.docker.com/products/docker-engine) opensource container platform.
7171

72-
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.
72+
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.
7373

74-
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).
74+
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/).
7575

7676
# Contributing
7777

@@ -528,8 +528,8 @@ This is simply done by adding the servers certificate into their list of trusted
528528
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:
529529

530530
```bash
531-
git clone https://git.local.host/gitlab-ce.git
532-
fatal: unable to access 'https://git.local.host/gitlab-ce.git': server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none
531+
git clone https://git.local.host/gitlab-foss.git
532+
fatal: unable to access 'https://git.local.host/gitlab-foss.git': server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none
533533
```
534534

535535
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.

assets/build/install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -e
33

4-
GITLAB_CLONE_URL=https://gitlab.com/gitlab-org/gitlab-ce.git
4+
GITLAB_CLONE_URL=https://gitlab.com/gitlab-org/gitlab-foss.git
55
GITLAB_SHELL_URL=https://gitlab.com/gitlab-org/gitlab-shell/-/archive/v${GITLAB_SHELL_VERSION}/gitlab-shell-v${GITLAB_SHELL_VERSION}.tar.bz2
66
GITLAB_WORKHORSE_URL=https://gitlab.com/gitlab-org/gitlab-workhorse.git
77
GITLAB_PAGES_URL=https://gitlab.com/gitlab-org/gitlab-pages.git
@@ -65,8 +65,8 @@ exec_as_git git config --global repack.writeBitmaps true
6565
exec_as_git git config --global receive.advertisePushOptions true
6666

6767

68-
# shallow clone gitlab-ce
69-
echo "Cloning gitlab-ce v.${GITLAB_VERSION}..."
68+
# shallow clone gitlab-foss
69+
echo "Cloning gitlab-foss v.${GITLAB_VERSION}..."
7070
exec_as_git git clone -q -b v${GITLAB_VERSION} --depth 1 ${GITLAB_CLONE_URL} ${GITLAB_INSTALL_DIR}
7171

7272
GITLAB_SHELL_VERSION=${GITLAB_SHELL_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_SHELL_VERSION)}

assets/runtime/config/nginx/gitlab-registry

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ server {
1616
}
1717

1818
server {
19-
# If a different port is specified in https://gitlab.com/gitlab-org/gitlab-ce/blob/8-8-stable/config/gitlab.yml.example#L182,
19+
# If a different port is specified in https://gitlab.com/gitlab-org/gitlab-foss/blob/8-8-stable/config/gitlab.yml.example#L182,
2020
# it should be declared here as well
2121
listen *:{{GITLAB_REGISTRY_PORT}} ssl http2;
2222
server_name {{GITLAB_REGISTRY_HOST}};

docs/container_registry.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,9 +378,9 @@ sameersbn/gitlab:12.3.1
378378

379379

380380
[wildcard certificate]: https://en.wikipedia.org/wiki/Wildcard_certificate
381-
[ce-4040]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4040
381+
[ce-4040]: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/4040
382382
[docker-insecure]: https://docs.docker.com/registry/insecure/
383383
[registry-deploy]: https://docs.docker.com/registry/deploying/
384384
[storage-config]: https://docs.docker.com/registry/configuration/#storage
385385
[token-config]: https://docs.docker.com/registry/configuration/#token
386-
[8-8-docs]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-8-stable/doc/administration/container_registry.md
386+
[8-8-docs]: https://gitlab.com/gitlab-org/gitlab-foss/blob/8-8-stable/doc/administration/container_registry.md

0 commit comments

Comments
 (0)