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
Léo-Paul Géneau
gitlab-ce
Commits
5ff3e937
Commit
5ff3e937
authored
Aug 08, 2018
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update templates for 11.2
parent
42713252
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
29 additions
and
22 deletions
+29
-22
vendor/Dockerfile/Node-alpine.Dockerfile
vendor/Dockerfile/Node-alpine.Dockerfile
+5
-4
vendor/Dockerfile/Node.Dockerfile
vendor/Dockerfile/Node.Dockerfile
+5
-4
vendor/Dockerfile/Ruby-alpine.Dockerfile
vendor/Dockerfile/Ruby-alpine.Dockerfile
+7
-4
vendor/Dockerfile/Ruby.Dockerfile
vendor/Dockerfile/Ruby.Dockerfile
+2
-2
vendor/gitignore/Autotools.gitignore
vendor/gitignore/Autotools.gitignore
+2
-0
vendor/gitignore/Laravel.gitignore
vendor/gitignore/Laravel.gitignore
+2
-5
vendor/gitignore/VisualStudio.gitignore
vendor/gitignore/VisualStudio.gitignore
+4
-1
vendor/gitlab-ci-yml/Maven.gitlab-ci.yml
vendor/gitlab-ci-yml/Maven.gitlab-ci.yml
+1
-1
vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml
vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml
+1
-1
No files found.
vendor/Dockerfile/Node-alpine.Dockerfile
View file @
5ff3e937
FROM
node:
7.9
-alpine
FROM
node:
8.11
-alpine
WORKDIR
/usr/src/app
ARG
NODE_ENV
ENV
NODE_ENV $NODE_ENV
COPY
package.json /usr/src/app/
RUN
npm
install
&&
npm cache clean
COPY
. /usr/src/app
RUN
npm
install
C
MD
[ "npm", "start" ]
C
OPY
. /usr/src/app
# replace this with your application's default port
EXPOSE
8888
CMD
[ "npm", "start" ]
vendor/Dockerfile/Node.Dockerfile
View file @
5ff3e937
FROM
node:
7.9
FROM
node:
8.11
WORKDIR
/usr/src/app
ARG
NODE_ENV
ENV
NODE_ENV $NODE_ENV
COPY
package.json /usr/src/app/
RUN
npm
install
&&
npm cache clean
COPY
. /usr/src/app
RUN
npm
install
C
MD
[ "npm", "start" ]
C
OPY
. /usr/src/app
# replace this with your application's default port
EXPOSE
8888
CMD
[ "npm", "start" ]
\ No newline at end of file
vendor/Dockerfile/Ruby-alpine.Dockerfile
View file @
5ff3e937
FROM
ruby:2.
4
-alpine
FROM
ruby:2.
5
-alpine
# Edit with nodejs, mysql-client, postgresql-client, sqlite3, etc. for your needs.
# Or delete entirely if not needed.
RUN
apk
--no-cache
add nodejs postgresql-client
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
...
...
@@ -11,7 +11,10 @@ RUN mkdir -p /usr/src/app
WORKDIR
/usr/src/app
COPY
Gemfile Gemfile.lock /usr/src/app/
RUN
bundle
install
# 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
...
...
@@ -21,4 +24,4 @@ COPY . /usr/src/app
# For Rails
EXPOSE
3000
CMD
["rails", "server"]
CMD
["
bundle", "exec", "
rails", "server"]
vendor/Dockerfile/Ruby.Dockerfile
View file @
5ff3e937
FROM
ruby:2.
4
FROM
ruby:2.
5
# Edit with nodejs, mysql-client, postgresql-client, sqlite3, etc. for your needs.
# Or delete entirely if not needed.
...
...
@@ -24,4 +24,4 @@ COPY . /usr/src/app
# For Rails
EXPOSE
3000
CMD
["rails", "server", "-b", "0.0.0.0"]
CMD
["
bundle", "exec", "
rails", "server", "-b", "0.0.0.0"]
vendor/gitignore/Autotools.gitignore
View file @
5ff3e937
...
...
@@ -16,6 +16,8 @@ autom4te.cache
/compile
/config.guess
/config.h.in
/config.log
/config.status
/config.sub
/configure
/configure.scan
...
...
vendor/gitignore/Laravel.gitignore
View file @
5ff3e937
vendor/
node_modules/
npm-debug.log
yarn-error.log
# Laravel 4 specific
bootstrap/compiled.php
...
...
@@ -10,11 +11,7 @@ app/storage/
public/storage
public/hot
storage/*.key
.env.*.php
.env.php
.env
Homestead.yaml
Homestead.json
# Rocketeer PHP task runner and deployment package. https://github.com/rocketeers/rocketeer
.rocketeer/
/.vagrant
vendor/gitignore/VisualStudio.gitignore
View file @
5ff3e937
...
...
@@ -59,7 +59,7 @@ StyleCopReport.xml
# Files built by Visual Studio
*_i.c
*_p.c
*_
i
.h
*_
h
.h
*.ilk
*.meta
*.obj
...
...
@@ -327,3 +327,6 @@ ASALocalRun/
# MFractors (Xamarin productivity tool) working folder
.mfractor/
# Local History for Visual Studio
.localhistory/
vendor/gitlab-ci-yml/Maven.gitlab-ci.yml
View file @
5ff3e937
...
...
@@ -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
:
"
-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
:
"
-D
https.protocols=TLSv1.2
-D
maven.repo.local=.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/Ruby.gitlab-ci.yml
View file @
5ff3e937
# Official language image. Look for the different tagged releases at:
# https://hub.docker.com/r/library/ruby/tags/
image
:
"
ruby:2.
4
"
image
:
"
ruby:2.
5
"
# Pick zero or more services to be used on all builds.
# Only needed when using a docker container to run your tests in.
...
...
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