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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
3414f33d
Commit
3414f33d
authored
Sep 07, 2018
by
Diana Stanley
Committed by
Bob Van Landuyt
Sep 10, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update templates and licenses for 11.3
parent
bea943ae
Changes
19
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
93 additions
and
563 deletions
+93
-563
vendor/Dockerfile/Node-alpine.Dockerfile
vendor/Dockerfile/Node-alpine.Dockerfile
+10
-8
vendor/Dockerfile/OpenJDK.Dockerfile
vendor/Dockerfile/OpenJDK.Dockerfile
+9
-5
vendor/Dockerfile/Ruby-alpine.Dockerfile
vendor/Dockerfile/Ruby-alpine.Dockerfile
+3
-3
vendor/gitignore/Global/Diff.gitignore
vendor/gitignore/Global/Diff.gitignore
+2
-0
vendor/gitignore/Global/JetBrains.gitignore
vendor/gitignore/Global/JetBrains.gitignore
+3
-0
vendor/gitignore/Global/MicrosoftOffice.gitignore
vendor/gitignore/Global/MicrosoftOffice.gitignore
+3
-0
vendor/gitignore/KiCad.gitignore
vendor/gitignore/KiCad.gitignore
+0
-1
vendor/gitignore/Processing.gitignore
vendor/gitignore/Processing.gitignore
+2
-0
vendor/gitignore/Python.gitignore
vendor/gitignore/Python.gitignore
+7
-0
vendor/gitignore/Rails.gitignore
vendor/gitignore/Rails.gitignore
+12
-0
vendor/gitignore/Swift.gitignore
vendor/gitignore/Swift.gitignore
+7
-0
vendor/gitignore/Symfony.gitignore
vendor/gitignore/Symfony.gitignore
+4
-0
vendor/gitignore/TeX.gitignore
vendor/gitignore/TeX.gitignore
+3
-0
vendor/gitignore/Terraform.gitignore
vendor/gitignore/Terraform.gitignore
+11
-0
vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
+2
-14
vendor/gitlab-ci-yml/Maven.gitlab-ci.yml
vendor/gitlab-ci-yml/Maven.gitlab-ci.yml
+1
-1
vendor/gitlab-ci-yml/Pages/Middleman.gitlab-ci.yml
vendor/gitlab-ci-yml/Pages/Middleman.gitlab-ci.yml
+6
-7
vendor/gitlab-ci-yml/Swift.gitlab-ci.yml
vendor/gitlab-ci-yml/Swift.gitlab-ci.yml
+1
-1
vendor/licenses.csv
vendor/licenses.csv
+7
-523
No files found.
vendor/Dockerfile/Node-alpine.Dockerfile
View file @
3414f33d
FROM
node:
8.11
-alpine
FROM
node:
10.6
-alpine
WORKDIR
/usr/src/app
# Uncomment if use of `process.dlopen` is necessary
# apk add --no-cache libc6-compat
ENV
PORT 8080
EXPOSE
8080 # replace this with your application's default port, if necessary
ARG
NODE_ENV
ARG
NODE_ENV
=production
ENV
NODE_ENV $NODE_ENV
COPY
package.json /usr/src/app/
WORKDIR
/usr/src/app
COPY
package.json .
RUN
npm
install
COPY
. .
COPY
. /usr/src/app
# replace this with your application's default port
EXPOSE
8888
CMD
[ "npm", "start" ]
vendor/Dockerfile/OpenJDK.Dockerfile
View file @
3414f33d
FROM
openjdk:9
FROM
maven:3.5-jdk-11 as BUILD
COPY
. /usr/src/
my
app
WORKDIR
/usr/src/myapp
COPY
. /usr/src/app
RUN
mvn
--batch-mode
-f
/usr/src/app/pom.xml clean package
RUN
javac Main.java
FROM
openjdk:11-jdk
ENV
PORT 4567
EXPOSE
4567
COPY
--from=BUILD /usr/src/app/target /opt/target
WORKDIR
/opt/target
CMD
["
java", "Main
"]
CMD
["
/bin/bash", "-c", "find -type f -name '*-with-dependencies.jar' | xargs java -jar
"]
vendor/Dockerfile/Ruby-alpine.Dockerfile
View file @
3414f33d
...
...
@@ -7,21 +7,21 @@ RUN apk --no-cache add nodejs postgresql-client tzdata
# throw errors if Gemfile has been modified since Gemfile.lock
RUN
bundle config
--global
frozen 1
RUN
mkdir
-p
/usr/src/app
WORKDIR
/usr/src/app
COPY
Gemfile Gemfile.lock
/usr/src/app/
COPY
Gemfile Gemfile.lock
.
# Install build dependencies - required for gems with native dependencies
RUN
apk add
--no-cache
--virtual
build-deps build-base postgresql-dev
&&
\
bundle
install
&&
\
apk del build-deps
COPY
.
/usr/src/app
COPY
.
.
# For Sinatra
#EXPOSE 4567
#CMD ["ruby", "./config.rb"]
# For Rails
ENV
PORT 3000
EXPOSE
3000
CMD
["bundle", "exec", "rails", "server"]
vendor/gitignore/Global/Diff.gitignore
0 → 100644
View file @
3414f33d
*.patch
*.diff
vendor/gitignore/Global/JetBrains.gitignore
View file @
3414f33d
...
...
@@ -8,6 +8,9 @@
.idea/**/dictionaries
.idea/**/shelf
# Generated files
.idea/**/contentModel.xml
# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
...
...
vendor/gitignore/Global/MicrosoftOffice.gitignore
View file @
3414f33d
...
...
@@ -3,6 +3,9 @@
# Word temporary
~$*.doc*
# Word Auto Backup File
Backup of *.doc*
# Excel temporary
~$*.xls*
...
...
vendor/gitignore/KiCad.gitignore
View file @
3414f33d
...
...
@@ -9,7 +9,6 @@
*~
_autosave-*
*.tmp
*-cache.lib
*-rescue.lib
*-save.pro
*-save.kicad_pcb
...
...
vendor/gitignore/Processing.gitignore
View file @
3414f33d
.DS_Store
applet
application.linux-arm64
application.linux-armv6hf
application.linux32
application.linux64
application.windows32
...
...
vendor/gitignore/Python.gitignore
View file @
3414f33d
...
...
@@ -38,6 +38,7 @@ pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
...
...
@@ -72,6 +73,10 @@ target/
# Jupyter Notebook
.ipynb_checkpoints
# IPython
profile_default/
ipython_config.py
# pyenv
.python-version
...
...
@@ -102,3 +107,5 @@ venv.bak/
# mypy
.mypy_cache/
.dmypy.json
dmypy.json
vendor/gitignore/Rails.gitignore
View file @
3414f33d
...
...
@@ -47,3 +47,15 @@ bower.json
# Ignore node_modules
node_modules/
# Ignore precompiled javascript packs
/public/packs
/public/packs-test
# Ignore yarn files
/yarn-error.log
yarn-debug.log*
.yarn-integrity
# Ignore uploaded files in development
/storage/*
!/storage/.keep
\ No newline at end of file
vendor/gitignore/Swift.gitignore
View file @
3414f33d
...
...
@@ -69,3 +69,10 @@ fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output
# Code Injection
#
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode
iOSInjectionProject/
vendor/gitignore/Symfony.gitignore
View file @
3414f33d
...
...
@@ -15,6 +15,10 @@
!var/logs/.gitkeep
!var/sessions/.gitkeep
# Logs (Symfony4)
/var/log/*
!var/log/.gitkeep
# Parameters
/app/config/parameters.yml
/app/config/parameters.ini
...
...
vendor/gitignore/TeX.gitignore
View file @
3414f33d
...
...
@@ -188,6 +188,9 @@ sympy-plots-for-*.tex/
*.pytxcode
pythontex-files-*/
# tcolorbox
*.listing
# thmtools
*.loe
...
...
vendor/gitignore/Terraform.gitignore
View file @
3414f33d
...
...
@@ -13,3 +13,14 @@ crash.log
# version control.
#
# example.tfvars
# Ignore override files as they are usually used to override resources locally and so
# are not checked in
override.tf
override.tf.json
*_override.tf
*_override.tf.json
# Include override files you do wish to add to version control using negated pattern
#
# !example_override.tf
vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
View file @
3414f33d
...
...
@@ -51,6 +51,8 @@ variables:
KUBERNETES_VERSION
:
1.8.6
HELM_VERSION
:
2.6.1
DOCKER_DRIVER
:
overlay2
stages
:
-
build
-
test
...
...
@@ -67,8 +69,6 @@ build:
image
:
docker:stable-git
services
:
-
docker:stable-dind
variables
:
DOCKER_DRIVER
:
overlay2
script
:
-
setup_docker
-
build
...
...
@@ -95,8 +95,6 @@ test:
code_quality
:
stage
:
test
image
:
docker:stable
variables
:
DOCKER_DRIVER
:
overlay2
allow_failure
:
true
services
:
-
docker:stable-dind
...
...
@@ -114,8 +112,6 @@ code_quality:
license_management
:
stage
:
test
image
:
docker:stable
variables
:
DOCKER_DRIVER
:
overlay2
allow_failure
:
true
services
:
-
docker:stable-dind
...
...
@@ -133,8 +129,6 @@ license_management:
performance
:
stage
:
performance
image
:
docker:stable
variables
:
DOCKER_DRIVER
:
overlay2
allow_failure
:
true
services
:
-
docker:stable-dind
...
...
@@ -156,8 +150,6 @@ performance:
sast
:
stage
:
test
image
:
docker:stable
variables
:
DOCKER_DRIVER
:
overlay2
allow_failure
:
true
services
:
-
docker:stable-dind
...
...
@@ -175,8 +167,6 @@ sast:
dependency_scanning
:
stage
:
test
image
:
docker:stable
variables
:
DOCKER_DRIVER
:
overlay2
allow_failure
:
true
services
:
-
docker:stable-dind
...
...
@@ -194,8 +184,6 @@ dependency_scanning:
container_scanning
:
stage
:
test
image
:
docker:stable
variables
:
DOCKER_DRIVER
:
overlay2
allow_failure
:
true
services
:
-
docker:stable-dind
...
...
vendor/gitlab-ci-yml/Maven.gitlab-ci.yml
View file @
3414f33d
...
...
@@ -17,7 +17,7 @@
variables
:
# This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
# `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
MAVEN_OPTS
:
"
-Dhttps.protocols=TLSv1.2
-Dmaven.repo.local=.m2/repository
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN
-Dorg.slf4j.simpleLogger.showDateTime=true
-Djava.awt.headless=true"
MAVEN_OPTS
:
"
-Dhttps.protocols=TLSv1.2
-Dmaven.repo.local=
$CI_PROJECT_DIR/
.m2/repository
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN
-Dorg.slf4j.simpleLogger.showDateTime=true
-Djava.awt.headless=true"
# As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
# when running from the command line.
# `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins.
...
...
vendor/gitlab-ci-yml/Pages/Middleman.gitlab-ci.yml
View file @
3414f33d
# Full project: https://gitlab.com/pages/middleman
image
:
ruby:2.4
variables
:
LANG
:
"
C.UTF-8"
image
:
ruby:2.3
cache
:
paths
:
-
vendor
before_script
:
test
:
script
:
-
apt-get update -yqqq
-
apt-get install -y nodejs
-
bundle install --path vendor
test
:
script
:
-
bundle exec middleman build
except
:
-
master
pages
:
script
:
-
apt-get update -yqqq
-
apt-get install -y nodejs
-
bundle install --path vendor
-
bundle exec middleman build
artifacts
:
paths
:
...
...
vendor/gitlab-ci-yml/Swift.gitlab-ci.yml
View file @
3414f33d
# Lifted from: https://about.gitlab.com/2016/03/10/setting-up-gitlab-ci-for-ios-projects/
# This file assumes an own GitLab CI runner, setup on a
n
macOS system.
# This file assumes an own GitLab CI runner, setup on a macOS system.
stages
:
-
build
-
archive
...
...
vendor/licenses.csv
View file @
3414f33d
This diff is collapsed.
Click to expand it.
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