Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
b8afc7b2
Commit
b8afc7b2
authored
Aug 01, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
1c6710c2
0e8dab12
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
431 additions
and
427 deletions
+431
-427
doc/api/jobs.md
doc/api/jobs.md
+3
-3
doc/ci/ci_cd_for_external_repos/bitbucket_integration.md
doc/ci/ci_cd_for_external_repos/bitbucket_integration.md
+99
-99
doc/ci/docker/using_docker_build.md
doc/ci/docker/using_docker_build.md
+171
-171
doc/ci/docker/using_docker_images.md
doc/ci/docker/using_docker_images.md
+67
-64
doc/ci/examples/artifactory_and_gitlab/index.md
doc/ci/examples/artifactory_and_gitlab/index.md
+36
-34
doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md
doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md
+55
-56
No files found.
doc/api/jobs.md
View file @
b8afc7b2
...
...
@@ -491,7 +491,7 @@ Parameters
Example request:
```
sh
curl
--header
"PRIVATE-TOKEN: <your_access_token>"
"https://gitlab.example.com/api/v4/projects/1/jobs/5/artifacts/some/release/file.pdf"
curl
--
location
--
header
"PRIVATE-TOKEN: <your_access_token>"
"https://gitlab.example.com/api/v4/projects/1/jobs/5/artifacts/some/release/file.pdf"
```
Possible response status codes:
...
...
@@ -526,7 +526,7 @@ Parameters:
Example request:
```
sh
curl
--header
"PRIVATE-TOKEN: <your_access_token>"
"https://gitlab.example.com/api/v4/projects/1/jobs/artifacts/master/raw/some/release/file.pdf?job=pdf"
curl
--
location
--
header
"PRIVATE-TOKEN: <your_access_token>"
"https://gitlab.example.com/api/v4/projects/1/jobs/artifacts/master/raw/some/release/file.pdf?job=pdf"
```
Possible response status codes:
...
...
@@ -551,7 +551,7 @@ GET /projects/:id/jobs/:job_id/trace
| job_id | integer | yes | ID of a job. |
```
sh
curl
--header
"PRIVATE-TOKEN: <your_access_token>"
"https://gitlab.example.com/api/v4/projects/1/jobs/8/trace"
curl
--
location
--
header
"PRIVATE-TOKEN: <your_access_token>"
"https://gitlab.example.com/api/v4/projects/1/jobs/8/trace"
```
Possible response status codes:
...
...
doc/ci/ci_cd_for_external_repos/bitbucket_integration.md
View file @
b8afc7b2
doc/ci/docker/using_docker_build.md
View file @
b8afc7b2
doc/ci/docker/using_docker_images.md
View file @
b8afc7b2
...
...
@@ -526,6 +526,7 @@ it's provided as an environment variable. This is because GitLab Runnner uses **
runtime.
### Using statically-defined credentials
There are two approaches that you can take in order to access a
private registry. Both require setting the environment variable
`DOCKER_AUTH_CONFIG`
with appropriate authentication info.
...
...
@@ -662,6 +663,7 @@ To configure credentials store, follow these steps:
Make sure helper program is available in GitLab Runner
`$PATH`
.
1.
Make GitLab Runner use it. There are two ways to accomplish this. Either:
-
Create a
[
variable
](
../variables/README.md#gitlab-cicd-environment-variables
)
`DOCKER_AUTH_CONFIG`
with the content of the
...
...
@@ -693,6 +695,7 @@ To configure access for `aws_account_id.dkr.ecr.region.amazonaws.com`, follow th
1.
Make sure
`docker-credential-ecr-login`
is available in GitLab Runner's
`$PATH`
.
1.
Make GitLab Runner use it. There are two ways to accomplish this. Either:
-
Create a
[
variable
](
../variables/README.md#gitlab-cicd-environment-variables
)
`DOCKER_AUTH_CONFIG`
with the content of the
Docker configuration file as the value:
...
...
doc/ci/examples/artifactory_and_gitlab/index.md
View file @
b8afc7b2
...
...
@@ -42,6 +42,7 @@ project:
```
https://gitlab.com/gitlab-examples/maven/simple-maven-dep.git
```
1.
Click
**Create project**
This application is nothing more than a basic class with a stub for a JUnit based test suite.
...
...
@@ -190,6 +191,7 @@ We'll use again a Maven app that can be cloned from our example project:
```
https://gitlab.com/gitlab-examples/maven/simple-maven-app.git
```
1.
Click
**Create project**
This one is a simple app as well. If you look at the
`src/main/java/com/example/app/App.java`
...
...
doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md
View file @
b8afc7b2
...
...
@@ -204,12 +204,11 @@ when running our Phoenix in our `localhost`.
-
Create an empty file named
`.gitkeep`
into
`hello_gitlab_ci/priv/repo/migrations`
As our project is still fresh, we don't have any data on our database, so, the
`migrations`
directory will be empty.
directory will be empty.
Without
`.gitkeep`
, git will not upload this empty directory and we'll got an error when running our
test on GitLab.
test on GitLab.
> **Note:**
If we add a folder via the GitLab UI, GitLab itself will add the `.gitkeep` to that new dir.
> **Note:** If we add a folder via the GitLab UI, GitLab itself will add the `.gitkeep` to that new dir.
Now, let's run a local test and see if everything we did didn't break anything.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment