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
92e5b3c3
Commit
92e5b3c3
authored
Sep 28, 2020
by
Marcel Amirault
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up yaml code block formatting
Fix spacing, indentation, comments, etc
parent
1036b045
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
61 additions
and
62 deletions
+61
-62
doc/administration/job_artifacts.md
doc/administration/job_artifacts.md
+2
-2
doc/administration/packages/container_registry.md
doc/administration/packages/container_registry.md
+2
-2
doc/administration/packages/dependency_proxy.md
doc/administration/packages/dependency_proxy.md
+17
-17
doc/administration/packages/index.md
doc/administration/packages/index.md
+25
-25
doc/ci/secrets/index.md
doc/ci/secrets/index.md
+1
-1
doc/ci/variables/README.md
doc/ci/variables/README.md
+2
-2
doc/ci/yaml/README.md
doc/ci/yaml/README.md
+3
-3
doc/user/packages/conan_repository/index.md
doc/user/packages/conan_repository/index.md
+0
-1
doc/user/packages/container_registry/index.md
doc/user/packages/container_registry/index.md
+9
-9
No files found.
doc/administration/job_artifacts.md
View file @
92e5b3c3
doc/administration/packages/container_registry.md
View file @
92e5b3c3
...
@@ -589,7 +589,7 @@ In the examples below we set the Registry's port to `5001`.
...
@@ -589,7 +589,7 @@ In the examples below we set the Registry's port to `5001`.
[
`http:addr`
](
https://docs.docker.com/registry/configuration/#http
)
value:
[
`http:addr`
](
https://docs.docker.com/registry/configuration/#http
)
value:
```
yaml
```
yaml
http
http
:
addr
:
localhost:5001
addr
:
localhost:5001
```
```
...
...
doc/administration/packages/dependency_proxy.md
View file @
92e5b3c3
...
@@ -135,28 +135,28 @@ This section describes the earlier configuration format.
...
@@ -135,28 +135,28 @@ This section describes the earlier configuration format.
##
##
## The location where build dependency_proxy are stored (default: shared/dependency_proxy).
## The location where build dependency_proxy are stored (default: shared/dependency_proxy).
##
##
#storage_path: shared/dependency_proxy
#
storage_path: shared/dependency_proxy
object_store
:
object_store
:
enabled
:
false
enabled
:
false
remote_directory
:
dependency_proxy
# The bucket name.
remote_directory
:
dependency_proxy
# The bucket name.
#direct_upload: false # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false).
#
direct_upload: false # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false).
#background_upload: true # Temporary option to limit automatic upload (Default: true).
#
background_upload: true # Temporary option to limit automatic upload (Default: true).
#proxy_download: false # Passthrough all downloads via GitLab instead of using Redirects to Object Storage.
#
proxy_download: false # Passthrough all downloads via GitLab instead of using Redirects to Object Storage.
connection
:
connection
:
##
##
## If the provider is AWS S3, uncomment
the following
## If the provider is AWS S3, use
the following
##
##
#
provider: AWS
provider
:
AWS
#
region: us-east-1
region
:
us-east-1
#
aws_access_key_id: AWS_ACCESS_KEY_ID
aws_access_key_id
:
AWS_ACCESS_KEY_ID
#
aws_secret_access_key: AWS_SECRET_ACCESS_KEY
aws_secret_access_key
:
AWS_SECRET_ACCESS_KEY
##
##
## If the provider is other than AWS (an S3-compatible one),
uncomment the following
## If the provider is other than AWS (an S3-compatible one),
comment out the previous 4 lines and use the following instead:
##
##
#host: 's3.amazonaws.com' # default: s3.amazonaws.com.
#
host: 's3.amazonaws.com' # default: s3.amazonaws.com.
#aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
#
aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
#endpoint: 'https://s3.amazonaws.com' # Useful for S3-compliant services such as DigitalOcean Spaces.
#
endpoint: 'https://s3.amazonaws.com' # Useful for S3-compliant services such as DigitalOcean Spaces.
#path_style: false # If true, use 'host/bucket_name/object' instead of 'bucket_name.host/object'.
#
path_style: false # If true, use 'host/bucket_name/object' instead of 'bucket_name.host/object'.
```
```
1.
[
Restart GitLab
](
../restart_gitlab.md#installations-from-source
"How to restart GitLab"
)
for the changes to take effect.
1.
[
Restart GitLab
](
../restart_gitlab.md#installations-from-source
"How to restart GitLab"
)
for the changes to take effect.
doc/administration/packages/index.md
View file @
92e5b3c3
...
@@ -147,28 +147,28 @@ We recommend using the [consolidated object storage settings](../object_storage.
...
@@ -147,28 +147,28 @@ We recommend using the [consolidated object storage settings](../object_storage.
##
##
## The location where build packages are stored (default: shared/packages).
## The location where build packages are stored (default: shared/packages).
##
##
#
storage_path: shared/packages
#
storage_path: shared/packages
object_store
:
object_store
:
enabled
:
false
enabled
:
false
remote_directory
:
packages
# The bucket name.
remote_directory
:
packages
# The bucket name.
#
direct_upload: false # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false).
#
direct_upload: false # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false).
#
background_upload: true # Temporary option to limit automatic upload (Default: true).
#
background_upload: true # Temporary option to limit automatic upload (Default: true).
#
proxy_download: false # Passthrough all downloads via GitLab instead of using Redirects to Object Storage.
#
proxy_download: false # Passthrough all downloads via GitLab instead of using Redirects to Object Storage.
connection
:
connection
:
##
##
## If the provider is AWS S3, uncomment the following
## If the provider is AWS S3, use the following:
##
##
#
provider: AWS
provider
:
AWS
#
region: us-east-1
region
:
us-east-1
#
aws_access_key_id: AWS_ACCESS_KEY_ID
aws_access_key_id
:
AWS_ACCESS_KEY_ID
#
aws_secret_access_key: AWS_SECRET_ACCESS_KEY
aws_secret_access_key
:
AWS_SECRET_ACCESS_KEY
##
##
## If the provider is other than AWS (an S3-compatible one), uncomment the following
## If the provider is other than AWS (an S3-compatible one), comment out the previous 4 lines and use the following instead:
##
##
#
host: 's3.amazonaws.com' # default: s3.amazonaws.com.
#
host: 's3.amazonaws.com' # default: s3.amazonaws.com.
#
aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
#
aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
#
endpoint: 'https://s3.amazonaws.com' # Useful for S3-compliant services such as DigitalOcean Spaces.
#
endpoint: 'https://s3.amazonaws.com' # Useful for S3-compliant services such as DigitalOcean Spaces.
#
path_style: false # If true, use 'host/bucket_name/object' instead of 'bucket_name.host/object'.
#
path_style: false # If true, use 'host/bucket_name/object' instead of 'bucket_name.host/object'.
```
```
1.
Save the file and
[
restart GitLab
](
../restart_gitlab.md#installations-from-source
)
for the changes to take effect.
1.
Save the file and
[
restart GitLab
](
../restart_gitlab.md#installations-from-source
)
for the changes to take effect.
...
...
doc/ci/secrets/index.md
View file @
92e5b3c3
doc/ci/variables/README.md
View file @
92e5b3c3
...
@@ -103,7 +103,7 @@ variables:
...
@@ -103,7 +103,7 @@ variables:
You can then call its value in your script:
You can then call its value in your script:
```
yaml
```
yaml
script
:
script
:
-
echo "$TEST"
-
echo "$TEST"
```
```
...
...
doc/ci/yaml/README.md
View file @
92e5b3c3
doc/user/packages/conan_repository/index.md
View file @
92e5b3c3
...
@@ -330,7 +330,6 @@ create_package:
...
@@ -330,7 +330,6 @@ create_package:
-
conan new <package-name>/0.1 -t
-
conan new <package-name>/0.1 -t
-
conan create . <group-name>+<project-name>/stable
-
conan create . <group-name>+<project-name>/stable
-
CONAN_LOGIN_USERNAME=ci_user CONAN_PASSWORD=${CI_JOB_TOKEN} conan upload <package-name>/0.1@<group-name>+<project-name>/stable --all --remote=gitlab
-
CONAN_LOGIN_USERNAME=ci_user CONAN_PASSWORD=${CI_JOB_TOKEN} conan upload <package-name>/0.1@<group-name>+<project-name>/stable --all --remote=gitlab
```
```
You can find additional Conan images to use as the base of your CI file
You can find additional Conan images to use as the base of your CI file
...
...
doc/user/packages/container_registry/index.md
View file @
92e5b3c3
...
@@ -307,7 +307,7 @@ in addition to the steps in the
...
@@ -307,7 +307,7 @@ in addition to the steps in the
Below is an example of what your
`.gitlab-ci.yml`
should look like:
Below is an example of what your
`.gitlab-ci.yml`
should look like:
```
yaml
```
yaml
build
:
build
:
image
:
$CI_REGISTRY/group/project/docker:19.03.12
image
:
$CI_REGISTRY/group/project/docker:19.03.12
services
:
services
:
-
name
:
$CI_REGISTRY/group/project/docker:19.03.12-dind
-
name
:
$CI_REGISTRY/group/project/docker:19.03.12-dind
...
...
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