Ran bin/rake gitlab:update_templates
This commit is contained in:
parent
31fa931399
commit
f87f4250dd
18 changed files with 150 additions and 63 deletions
25
vendor/Dockerfile/CONTRIBUTING.md
vendored
25
vendor/Dockerfile/CONTRIBUTING.md
vendored
|
@ -1,22 +1,15 @@
|
|||
The canonical repository for `Dockerfile` templates is
|
||||
https://gitlab.com/gitlab-org/Dockerfile.
|
||||
## Developer Certificate of Origin + License
|
||||
|
||||
GitLab only mirrors the templates. Please submit your merge requests to
|
||||
https://gitlab.com/gitlab-org/Dockerfile.
|
||||
By contributing to GitLab B.V., You accept and agree to the following terms and
|
||||
conditions for Your present and future Contributions submitted to GitLab B.V.
|
||||
Except for the license granted herein to GitLab B.V. and recipients of software
|
||||
distributed by GitLab B.V., You reserve all right, title, and interest in and to
|
||||
Your Contributions. All Contributions are subject to the following DCO + License
|
||||
terms.
|
||||
|
||||
## Contributing
|
||||
[DCO + License](https://gitlab.com/gitlab-org/dco/blob/master/README.md)
|
||||
|
||||
Thank you for your interest in contributing to this GitLab project! We welcome
|
||||
all contributions. By participating in this project, you agree to abide by the
|
||||
[code of conduct](#code-of-conduct).
|
||||
|
||||
## Contributor license agreement
|
||||
|
||||
By submitting code as an individual you agree to the [individual contributor
|
||||
license agreement][individual-agreement].
|
||||
|
||||
By submitting code as an entity you agree to the [corporate contributor license
|
||||
agreement][corporate-agreement].
|
||||
_This notice should stay as the first item in the CONTRIBUTING.md file._
|
||||
|
||||
## Code of conduct
|
||||
|
||||
|
|
16
vendor/Dockerfile/LICENSE
vendored
16
vendor/Dockerfile/LICENSE
vendored
|
@ -1,6 +1,6 @@
|
|||
The MIT License (MIT)
|
||||
Copyright (c) 2011-2017 GitLab B.V.
|
||||
|
||||
Copyright (c) 2016-2017 GitLab.org
|
||||
With regard to the GitLab Software:
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
@ -9,13 +9,17 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
|
||||
For all third party components incorporated into the GitLab Software, those
|
||||
components are licensed under the original license provided by the owner of the
|
||||
applicable component.
|
||||
|
|
3
vendor/gitignore/Global/Matlab.gitignore
vendored
3
vendor/gitignore/Global/Matlab.gitignore
vendored
|
@ -1,5 +1,5 @@
|
|||
##---------------------------------------------------
|
||||
## Remove autosaves generated by the Matlab editor
|
||||
## Remove autosaves generated by the MATLAB editor
|
||||
## We have git for backups!
|
||||
##---------------------------------------------------
|
||||
|
||||
|
@ -14,6 +14,7 @@
|
|||
|
||||
# Simulink Code Generation
|
||||
slprj/
|
||||
sccprj/
|
||||
|
||||
# Session info
|
||||
octave-workspace
|
||||
|
|
3
vendor/gitignore/Go.gitignore
vendored
3
vendor/gitignore/Go.gitignore
vendored
|
@ -9,6 +9,3 @@
|
|||
|
||||
# Output of the go coverage tool, specifically when used with LiteIDE
|
||||
*.out
|
||||
|
||||
# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
|
||||
.glide/
|
||||
|
|
1
vendor/gitignore/Haskell.gitignore
vendored
1
vendor/gitignore/Haskell.gitignore
vendored
|
@ -17,5 +17,6 @@ cabal.sandbox.config
|
|||
*.eventlog
|
||||
.stack-work/
|
||||
cabal.project.local
|
||||
cabal.project.local~
|
||||
.HTF/
|
||||
.ghc.environment.*
|
||||
|
|
1
vendor/gitignore/Jekyll.gitignore
vendored
1
vendor/gitignore/Jekyll.gitignore
vendored
|
@ -1,3 +1,4 @@
|
|||
_site/
|
||||
.sass-cache/
|
||||
.jekyll-cache/
|
||||
.jekyll-metadata
|
||||
|
|
2
vendor/gitignore/ROS.gitignore
vendored
2
vendor/gitignore/ROS.gitignore
vendored
|
@ -1,3 +1,5 @@
|
|||
devel/
|
||||
logs/
|
||||
build/
|
||||
bin/
|
||||
lib/
|
||||
|
|
4
vendor/gitignore/Symfony.gitignore
vendored
4
vendor/gitignore/Symfony.gitignore
vendored
|
@ -25,6 +25,7 @@
|
|||
/bin/*
|
||||
!bin/console
|
||||
!bin/symfony_requirements
|
||||
/vendor/
|
||||
|
||||
# Assets and user uploads
|
||||
/web/bundles/
|
||||
|
@ -37,6 +38,9 @@
|
|||
# Build data
|
||||
/build/
|
||||
|
||||
# Composer PHAR
|
||||
/composer.phar
|
||||
|
||||
# Backup entities generated with doctrine:generate:entities command
|
||||
**/Entity/*~
|
||||
|
||||
|
|
6
vendor/gitignore/TeX.gitignore
vendored
6
vendor/gitignore/TeX.gitignore
vendored
|
@ -215,7 +215,11 @@ TSWLatexianTemp*
|
|||
*~[0-9]*
|
||||
|
||||
# auto folder when using emacs and auctex
|
||||
/auto/*
|
||||
./auto/*
|
||||
*.el
|
||||
|
||||
# expex forward references with \gathertags
|
||||
*-tags.tex
|
||||
|
||||
# standalone packages
|
||||
*.sta
|
||||
|
|
13
vendor/gitignore/Unity.gitignore
vendored
13
vendor/gitignore/Unity.gitignore
vendored
|
@ -1,9 +1,9 @@
|
|||
/[Ll]ibrary/
|
||||
/[Tt]emp/
|
||||
/[Oo]bj/
|
||||
/[Bb]uild/
|
||||
/[Bb]uilds/
|
||||
/Assets/AssetStoreTools*
|
||||
[Ll]ibrary/
|
||||
[Tt]emp/
|
||||
[Oo]bj/
|
||||
[Bb]uild/
|
||||
[Bb]uilds/
|
||||
Assets/AssetStoreTools*
|
||||
|
||||
# Visual Studio 2015 cache directory
|
||||
/.vs/
|
||||
|
@ -25,6 +25,7 @@ ExportedObj/
|
|||
|
||||
# Unity3D generated meta files
|
||||
*.pidb.meta
|
||||
*.pdb.meta
|
||||
|
||||
# Unity3D Generated File On Crash Reports
|
||||
sysinfo.txt
|
||||
|
|
2
vendor/gitignore/UnrealEngine.gitignore
vendored
2
vendor/gitignore/UnrealEngine.gitignore
vendored
|
@ -50,6 +50,7 @@ SourceArt/**/*.tga
|
|||
|
||||
# Binary Files
|
||||
Binaries/*
|
||||
Plugins/*/Binaries/*
|
||||
|
||||
# Builds
|
||||
Build/*
|
||||
|
@ -70,6 +71,7 @@ Saved/*
|
|||
|
||||
# Compiled source files for the engine to use
|
||||
Intermediate/*
|
||||
Plugins/*/Intermediate/*
|
||||
|
||||
# Cache files for the editor to use
|
||||
DerivedDataCache/*
|
||||
|
|
14
vendor/gitignore/VisualStudio.gitignore
vendored
14
vendor/gitignore/VisualStudio.gitignore
vendored
|
@ -24,11 +24,14 @@ bld/
|
|||
[Oo]bj/
|
||||
[Ll]og/
|
||||
|
||||
# Visual Studio 2015 cache/options directory
|
||||
# Visual Studio 2015/2017 cache/options directory
|
||||
.vs/
|
||||
# Uncomment if you have tasks that create the project's static files in wwwroot
|
||||
#wwwroot/
|
||||
|
||||
# Visual Studio 2017 auto generated files
|
||||
Generated\ Files/
|
||||
|
||||
# MSTest test Results
|
||||
[Tt]est[Rr]esult*/
|
||||
[Bb]uild[Ll]og.*
|
||||
|
@ -51,6 +54,10 @@ project.fragment.lock.json
|
|||
artifacts/
|
||||
**/Properties/launchSettings.json
|
||||
|
||||
# StyleCop
|
||||
StyleCopReport.xml
|
||||
|
||||
# Files built by Visual Studio
|
||||
*_i.c
|
||||
*_p.c
|
||||
*_i.h
|
||||
|
@ -247,7 +254,7 @@ FakesAssemblies/
|
|||
.ntvs_analysis.dat
|
||||
node_modules/
|
||||
|
||||
# Typescript v1 declaration files
|
||||
# TypeScript v1 declaration files
|
||||
typings/
|
||||
|
||||
# Visual Studio 6 build log
|
||||
|
@ -303,3 +310,6 @@ __pycache__/
|
|||
|
||||
# OpenCover UI analysis results
|
||||
OpenCover/
|
||||
|
||||
# Azure Stream Analytics local run output
|
||||
ASALocalRun/
|
||||
|
|
31
vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
vendored
31
vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
vendored
|
@ -83,6 +83,16 @@ codequality:
|
|||
artifacts:
|
||||
paths: [codeclimate.json]
|
||||
|
||||
sast:
|
||||
image: registry.gitlab.com/gitlab-org/gl-sast:latest
|
||||
variables:
|
||||
POSTGRES_DB: "false"
|
||||
allow_failure: true
|
||||
script:
|
||||
- /app/bin/run .
|
||||
artifacts:
|
||||
paths: [gl-sast-report.json]
|
||||
|
||||
review:
|
||||
stage: review
|
||||
script:
|
||||
|
@ -218,8 +228,8 @@ production:
|
|||
--volume /var/run/docker.sock:/var/run/docker.sock \
|
||||
--volume /tmp/cc:/tmp/cc"
|
||||
|
||||
docker run ${cc_opts} codeclimate/codeclimate init
|
||||
docker run ${cc_opts} codeclimate/codeclimate analyze -f json > codeclimate.json
|
||||
docker run ${cc_opts} codeclimate/codeclimate:0.69.0 init
|
||||
docker run ${cc_opts} codeclimate/codeclimate:0.69.0 analyze -f json > codeclimate.json
|
||||
}
|
||||
|
||||
function deploy() {
|
||||
|
@ -345,6 +355,13 @@ production:
|
|||
}
|
||||
|
||||
function build() {
|
||||
|
||||
if [[ -n "$CI_REGISTRY_USER" ]]; then
|
||||
echo "Logging to GitLab Container Registry with CI credentials..."
|
||||
docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
|
||||
echo ""
|
||||
fi
|
||||
|
||||
if [[ -f Dockerfile ]]; then
|
||||
echo "Building Dockerfile-based application..."
|
||||
docker build -t "$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG" .
|
||||
|
@ -362,12 +379,6 @@ production:
|
|||
echo ""
|
||||
fi
|
||||
|
||||
if [[ -n "$CI_REGISTRY_USER" ]]; then
|
||||
echo "Logging to GitLab Container Registry with CI credentials..."
|
||||
docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
|
||||
echo ""
|
||||
fi
|
||||
|
||||
echo "Pushing to GitLab Container Registry..."
|
||||
docker push "$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG"
|
||||
echo ""
|
||||
|
@ -402,7 +413,9 @@ production:
|
|||
name="$name-$track"
|
||||
fi
|
||||
|
||||
helm delete "$name" || true
|
||||
if [[ -n "$(helm ls -q "^$name$")" ]]; then
|
||||
helm delete "$name"
|
||||
fi
|
||||
}
|
||||
|
||||
before_script:
|
||||
|
|
19
vendor/gitlab-ci-yml/CONTRIBUTING.md
vendored
19
vendor/gitlab-ci-yml/CONTRIBUTING.md
vendored
|
@ -1,16 +1,15 @@
|
|||
## Contributing
|
||||
## Developer Certificate of Origin + License
|
||||
|
||||
Thank you for your interest in contributing to this GitLab project! We welcome
|
||||
all contributions. By participating in this project, you agree to abide by the
|
||||
[code of conduct](#code-of-conduct).
|
||||
By contributing to GitLab B.V., You accept and agree to the following terms and
|
||||
conditions for Your present and future Contributions submitted to GitLab B.V.
|
||||
Except for the license granted herein to GitLab B.V. and recipients of software
|
||||
distributed by GitLab B.V., You reserve all right, title, and interest in and to
|
||||
Your Contributions. All Contributions are subject to the following DCO + License
|
||||
terms.
|
||||
|
||||
## Contributor license agreement
|
||||
[DCO + License](https://gitlab.com/gitlab-org/dco/blob/master/README.md)
|
||||
|
||||
By submitting code as an individual you agree to the [individual contributor
|
||||
license agreement][individual-agreement].
|
||||
|
||||
By submitting code as an entity you agree to the [corporate contributor license
|
||||
agreement][corporate-agreement].
|
||||
_This notice should stay as the first item in the CONTRIBUTING.md file._
|
||||
|
||||
## Code of conduct
|
||||
|
||||
|
|
51
vendor/gitlab-ci-yml/Chef.gitlab-ci.yml
vendored
Normal file
51
vendor/gitlab-ci-yml/Chef.gitlab-ci.yml
vendored
Normal file
|
@ -0,0 +1,51 @@
|
|||
# This file uses Test Kitchen with the kitchen-dokken driver to
|
||||
# perform functional testing. Doing so requires that your runner be a
|
||||
# Docker runner configured for privileged mode. Please see
|
||||
# https://docs.gitlab.com/runner/executors/docker.html#use-docker-in-docker-with-privileged-mode
|
||||
# for help configuring your runner properly, or, if you want to switch
|
||||
# to a different driver, see http://kitchen.ci/docs/drivers
|
||||
|
||||
image: "chef/chefdk"
|
||||
services:
|
||||
- docker:dind
|
||||
|
||||
variables:
|
||||
DOCKER_HOST: "tcp://docker:2375"
|
||||
KITCHEN_LOCAL_YAML: ".kitchen.dokken.yml"
|
||||
|
||||
stages:
|
||||
- lint
|
||||
- unit
|
||||
- functional
|
||||
|
||||
foodcritic:
|
||||
stage: lint
|
||||
script:
|
||||
- chef exec foodcritic .
|
||||
|
||||
cookstyle:
|
||||
stage: lint
|
||||
script:
|
||||
- chef exec cookstyle .
|
||||
|
||||
chefspec:
|
||||
stage: unit
|
||||
script:
|
||||
- chef exec rspec spec
|
||||
|
||||
# Set up your test matrix here. Example:
|
||||
#verify-centos-6:
|
||||
# stage: functional
|
||||
# before_script:
|
||||
# - apt-get update
|
||||
# - apt-get -y install rsync
|
||||
# script:
|
||||
# - kitchen verify default-centos-6 --destroy=always
|
||||
#
|
||||
#verify-centos-7:
|
||||
# stage: functional
|
||||
# before_script:
|
||||
# - apt-get update
|
||||
# - apt-get -y install rsync
|
||||
# script:
|
||||
# - kitchen verify default-centos-7 --destroy=always
|
4
vendor/gitlab-ci-yml/Go.gitlab-ci.yml
vendored
4
vendor/gitlab-ci-yml/Go.gitlab-ci.yml
vendored
|
@ -11,8 +11,8 @@ variables:
|
|||
# repository in /go/src/gitlab.com/namespace/project
|
||||
# Thus, making a symbolic link corrects this.
|
||||
before_script:
|
||||
- mkdir -p $GOPATH/src/$REPO_NAME
|
||||
- ln -svf $CI_PROJECT_DIR/* $GOPATH/src/$REPO_NAME
|
||||
- mkdir -p $GOPATH/src/$(dirname $REPO_NAME)
|
||||
- ln -svf $CI_PROJECT_DIR $GOPATH/src/$REPO_NAME
|
||||
- cd $GOPATH/src/$REPO_NAME
|
||||
|
||||
stages:
|
||||
|
|
16
vendor/gitlab-ci-yml/LICENSE
vendored
16
vendor/gitlab-ci-yml/LICENSE
vendored
|
@ -1,6 +1,6 @@
|
|||
The MIT License (MIT)
|
||||
Copyright (c) 2011-2017 GitLab B.V.
|
||||
|
||||
Copyright (c) 2016-2017 GitLab.org
|
||||
With regard to the GitLab Software:
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
@ -9,13 +9,17 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
|
||||
For all third party components incorporated into the GitLab Software, those
|
||||
components are licensed under the original license provided by the owner of the
|
||||
applicable component.
|
||||
|
|
2
vendor/gitlab-ci-yml/Rust.gitlab-ci.yml
vendored
2
vendor/gitlab-ci-yml/Rust.gitlab-ci.yml
vendored
|
@ -20,4 +20,4 @@ image: "rust:latest"
|
|||
test:cargo:
|
||||
script:
|
||||
- rustc --version && cargo --version # Print version info for debugging
|
||||
- cargo test --verbose --jobs 1 --release # Don't paralize to make errors more readable
|
||||
- cargo test --verbose --jobs 1 --release # Don't parallelise to make errors more readable
|
||||
|
|
Loading…
Reference in a new issue