Commit d07169c8 authored by GitLab Bot's avatar GitLab Bot

Add latest changes from gitlab-org/gitlab@master

parent 6377f3e2
...@@ -576,8 +576,8 @@ There are two ways to determine the value of `DOCKER_AUTH_CONFIG`: ...@@ -576,8 +576,8 @@ There are two ways to determine the value of `DOCKER_AUTH_CONFIG`:
will use the available system keystore to store the result of `docker will use the available system keystore to store the result of `docker
login`. In that case, it's impossible to read `~/.docker/config.json`, login`. In that case, it's impossible to read `~/.docker/config.json`,
so you will need to prepare the required base64-encoded version of so you will need to prepare the required base64-encoded version of
`${username}:${password}` manually. Open a terminal and execute the `${username}:${password}` and create the Docker configuration JSON manually.
following command: Open a terminal and execute the following command:
```bash ```bash
echo -n "my_username:my_password" | base64 echo -n "my_username:my_password" | base64
...@@ -586,6 +586,18 @@ There are two ways to determine the value of `DOCKER_AUTH_CONFIG`: ...@@ -586,6 +586,18 @@ There are two ways to determine the value of `DOCKER_AUTH_CONFIG`:
bXlfdXNlcm5hbWU6bXlfcGFzc3dvcmQ= bXlfdXNlcm5hbWU6bXlfcGFzc3dvcmQ=
``` ```
Create the Docker JSON configuration content as follows:
```json
{
"auths": {
"registry.example.com:5000": {
"auth": "(Base64 content from above)"
}
}
}
```
#### Configuring a job #### Configuring a job
To configure a single job with access for `registry.example.com:5000`, To configure a single job with access for `registry.example.com:5000`,
......
...@@ -44,6 +44,9 @@ create the resource via the public GitLab API: ...@@ -44,6 +44,9 @@ create the resource via the public GitLab API:
- `#api_post_path`: The `POST` path to create a new resource. - `#api_post_path`: The `POST` path to create a new resource.
- `#api_post_body`: The `POST` body (as a Ruby hash) to create a new resource. - `#api_post_body`: The `POST` body (as a Ruby hash) to create a new resource.
> Be aware that many API resources are [paginated](../../../api/README.md#pagination).
> If you don't find the results you expect, check if there is more that one page of results.
Let's take the `Shirt` resource class, and add these three API methods: Let's take the `Shirt` resource class, and add these three API methods:
```ruby ```ruby
......
...@@ -7,8 +7,9 @@ describe 'Group Badges' do ...@@ -7,8 +7,9 @@ describe 'Group Badges' do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:group) { create(:group) } let(:group) { create(:group) }
let(:badge_link_url) { 'https://gitlab.com/gitlab-org/gitlab/commits/master'} let(:project) { create(:project, namespace: group) }
let(:badge_image_url) { 'https://gitlab.com/gitlab-org/gitlab/badges/master/build.svg'} let(:badge_link_url) { "http://#{page.server.host}:#{page.server.port}/#{project.full_path}/commits/master" }
let(:badge_image_url) { "http://#{page.server.host}:#{page.server.port}/#{project.full_path}/badges/master/pipeline.svg" }
let!(:badge_1) { create(:group_badge, group: group) } let!(:badge_1) { create(:group_badge, group: group) }
let!(:badge_2) { create(:group_badge, group: group) } let!(:badge_2) { create(:group_badge, group: group) }
......
...@@ -8,8 +8,8 @@ describe 'Project Badges' do ...@@ -8,8 +8,8 @@ describe 'Project Badges' do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:group) { create(:group) } let(:group) { create(:group) }
let(:project) { create(:project, namespace: group) } let(:project) { create(:project, namespace: group) }
let(:badge_link_url) { 'https://gitlab.com/gitlab-org/gitlab/commits/master'} let(:badge_link_url) { "http://#{page.server.host}:#{page.server.port}/#{project.full_path}/commits/master" }
let(:badge_image_url) { 'https://gitlab.com/gitlab-org/gitlab/badges/master/build.svg'} let(:badge_image_url) { "http://#{page.server.host}:#{page.server.port}/#{project.full_path}/badges/master/pipeline.svg" }
let!(:project_badge) { create(:project_badge, project: project) } let!(:project_badge) { create(:project_badge, project: project) }
let!(:group_badge) { create(:group_badge, group: group) } let!(:group_badge) { create(:group_badge, group: group) }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment