Commit f87f4250 authored by Luke Bennett's avatar Luke Bennett

Ran bin/rake gitlab:update_templates

parent 31fa9313
The canonical repository for `Dockerfile` templates is ## Developer Certificate of Origin + License
https://gitlab.com/gitlab-org/Dockerfile.
GitLab only mirrors the templates. Please submit your merge requests to By contributing to GitLab B.V., You accept and agree to the following terms and
https://gitlab.com/gitlab-org/Dockerfile. 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 _This notice should stay as the first item in the CONTRIBUTING.md file._
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].
## Code of conduct ## Code of conduct
......
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 Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal 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 ...@@ -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 copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions: furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all The above copyright notice and this permission notice shall be included in
copies or substantial portions of the Software. all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 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 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
SOFTWARE. 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.
##--------------------------------------------------- ##---------------------------------------------------
## Remove autosaves generated by the Matlab editor ## Remove autosaves generated by the MATLAB editor
## We have git for backups! ## We have git for backups!
##--------------------------------------------------- ##---------------------------------------------------
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
# Simulink Code Generation # Simulink Code Generation
slprj/ slprj/
sccprj/
# Session info # Session info
octave-workspace octave-workspace
......
...@@ -9,6 +9,3 @@ ...@@ -9,6 +9,3 @@
# Output of the go coverage tool, specifically when used with LiteIDE # Output of the go coverage tool, specifically when used with LiteIDE
*.out *.out
# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
.glide/
...@@ -17,5 +17,6 @@ cabal.sandbox.config ...@@ -17,5 +17,6 @@ cabal.sandbox.config
*.eventlog *.eventlog
.stack-work/ .stack-work/
cabal.project.local cabal.project.local
cabal.project.local~
.HTF/ .HTF/
.ghc.environment.* .ghc.environment.*
_site/ _site/
.sass-cache/ .sass-cache/
.jekyll-cache/
.jekyll-metadata .jekyll-metadata
devel/
logs/
build/ build/
bin/ bin/
lib/ lib/
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
/bin/* /bin/*
!bin/console !bin/console
!bin/symfony_requirements !bin/symfony_requirements
/vendor/
# Assets and user uploads # Assets and user uploads
/web/bundles/ /web/bundles/
...@@ -37,6 +38,9 @@ ...@@ -37,6 +38,9 @@
# Build data # Build data
/build/ /build/
# Composer PHAR
/composer.phar
# Backup entities generated with doctrine:generate:entities command # Backup entities generated with doctrine:generate:entities command
**/Entity/*~ **/Entity/*~
......
...@@ -215,7 +215,11 @@ TSWLatexianTemp* ...@@ -215,7 +215,11 @@ TSWLatexianTemp*
*~[0-9]* *~[0-9]*
# auto folder when using emacs and auctex # auto folder when using emacs and auctex
/auto/* ./auto/*
*.el
# expex forward references with \gathertags # expex forward references with \gathertags
*-tags.tex *-tags.tex
# standalone packages
*.sta
/[Ll]ibrary/ [Ll]ibrary/
/[Tt]emp/ [Tt]emp/
/[Oo]bj/ [Oo]bj/
/[Bb]uild/ [Bb]uild/
/[Bb]uilds/ [Bb]uilds/
/Assets/AssetStoreTools* Assets/AssetStoreTools*
# Visual Studio 2015 cache directory # Visual Studio 2015 cache directory
/.vs/ /.vs/
...@@ -25,6 +25,7 @@ ExportedObj/ ...@@ -25,6 +25,7 @@ ExportedObj/
# Unity3D generated meta files # Unity3D generated meta files
*.pidb.meta *.pidb.meta
*.pdb.meta
# Unity3D Generated File On Crash Reports # Unity3D Generated File On Crash Reports
sysinfo.txt sysinfo.txt
......
...@@ -50,6 +50,7 @@ SourceArt/**/*.tga ...@@ -50,6 +50,7 @@ SourceArt/**/*.tga
# Binary Files # Binary Files
Binaries/* Binaries/*
Plugins/*/Binaries/*
# Builds # Builds
Build/* Build/*
...@@ -70,6 +71,7 @@ Saved/* ...@@ -70,6 +71,7 @@ Saved/*
# Compiled source files for the engine to use # Compiled source files for the engine to use
Intermediate/* Intermediate/*
Plugins/*/Intermediate/*
# Cache files for the editor to use # Cache files for the editor to use
DerivedDataCache/* DerivedDataCache/*
...@@ -24,11 +24,14 @@ bld/ ...@@ -24,11 +24,14 @@ bld/
[Oo]bj/ [Oo]bj/
[Ll]og/ [Ll]og/
# Visual Studio 2015 cache/options directory # Visual Studio 2015/2017 cache/options directory
.vs/ .vs/
# Uncomment if you have tasks that create the project's static files in wwwroot # Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/ #wwwroot/
# Visual Studio 2017 auto generated files
Generated\ Files/
# MSTest test Results # MSTest test Results
[Tt]est[Rr]esult*/ [Tt]est[Rr]esult*/
[Bb]uild[Ll]og.* [Bb]uild[Ll]og.*
...@@ -51,6 +54,10 @@ project.fragment.lock.json ...@@ -51,6 +54,10 @@ project.fragment.lock.json
artifacts/ artifacts/
**/Properties/launchSettings.json **/Properties/launchSettings.json
# StyleCop
StyleCopReport.xml
# Files built by Visual Studio
*_i.c *_i.c
*_p.c *_p.c
*_i.h *_i.h
...@@ -247,7 +254,7 @@ FakesAssemblies/ ...@@ -247,7 +254,7 @@ FakesAssemblies/
.ntvs_analysis.dat .ntvs_analysis.dat
node_modules/ node_modules/
# Typescript v1 declaration files # TypeScript v1 declaration files
typings/ typings/
# Visual Studio 6 build log # Visual Studio 6 build log
...@@ -303,3 +310,6 @@ __pycache__/ ...@@ -303,3 +310,6 @@ __pycache__/
# OpenCover UI analysis results # OpenCover UI analysis results
OpenCover/ OpenCover/
# Azure Stream Analytics local run output
ASALocalRun/
...@@ -83,6 +83,16 @@ codequality: ...@@ -83,6 +83,16 @@ codequality:
artifacts: artifacts:
paths: [codeclimate.json] 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: review:
stage: review stage: review
script: script:
...@@ -218,8 +228,8 @@ production: ...@@ -218,8 +228,8 @@ production:
--volume /var/run/docker.sock:/var/run/docker.sock \ --volume /var/run/docker.sock:/var/run/docker.sock \
--volume /tmp/cc:/tmp/cc" --volume /tmp/cc:/tmp/cc"
docker run ${cc_opts} codeclimate/codeclimate init docker run ${cc_opts} codeclimate/codeclimate:0.69.0 init
docker run ${cc_opts} codeclimate/codeclimate analyze -f json > codeclimate.json docker run ${cc_opts} codeclimate/codeclimate:0.69.0 analyze -f json > codeclimate.json
} }
function deploy() { function deploy() {
...@@ -345,6 +355,13 @@ production: ...@@ -345,6 +355,13 @@ production:
} }
function build() { 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 if [[ -f Dockerfile ]]; then
echo "Building Dockerfile-based application..." echo "Building Dockerfile-based application..."
docker build -t "$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG" . docker build -t "$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG" .
...@@ -362,12 +379,6 @@ production: ...@@ -362,12 +379,6 @@ production:
echo "" echo ""
fi 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..." echo "Pushing to GitLab Container Registry..."
docker push "$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG" docker push "$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG"
echo "" echo ""
...@@ -402,7 +413,9 @@ production: ...@@ -402,7 +413,9 @@ production:
name="$name-$track" name="$name-$track"
fi fi
helm delete "$name" || true if [[ -n "$(helm ls -q "^$name$")" ]]; then
helm delete "$name"
fi
} }
before_script: before_script:
......
## Contributing ## Developer Certificate of Origin + License
Thank you for your interest in contributing to this GitLab project! We welcome By contributing to GitLab B.V., You accept and agree to the following terms and
all contributions. By participating in this project, you agree to abide by the conditions for Your present and future Contributions submitted to GitLab B.V.
[code of conduct](#code-of-conduct). 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 _This notice should stay as the first item in the CONTRIBUTING.md file._
license agreement][individual-agreement].
By submitting code as an entity you agree to the [corporate contributor license
agreement][corporate-agreement].
## Code of conduct ## Code of conduct
......
# 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
...@@ -11,8 +11,8 @@ variables: ...@@ -11,8 +11,8 @@ variables:
# repository in /go/src/gitlab.com/namespace/project # repository in /go/src/gitlab.com/namespace/project
# Thus, making a symbolic link corrects this. # Thus, making a symbolic link corrects this.
before_script: before_script:
- mkdir -p $GOPATH/src/$REPO_NAME - mkdir -p $GOPATH/src/$(dirname $REPO_NAME)
- ln -svf $CI_PROJECT_DIR/* $GOPATH/src/$REPO_NAME - ln -svf $CI_PROJECT_DIR $GOPATH/src/$REPO_NAME
- cd $GOPATH/src/$REPO_NAME - cd $GOPATH/src/$REPO_NAME
stages: stages:
......
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 Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal 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 ...@@ -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 copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions: furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all The above copyright notice and this permission notice shall be included in
copies or substantial portions of the Software. all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 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 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
SOFTWARE. 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.
...@@ -20,4 +20,4 @@ image: "rust:latest" ...@@ -20,4 +20,4 @@ image: "rust:latest"
test:cargo: test:cargo:
script: script:
- rustc --version && cargo --version # Print version info for debugging - 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
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