Commit 5ff3e937 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Update templates for 11.2

parent 42713252
FROM node:7.9-alpine FROM node:8.11-alpine
WORKDIR /usr/src/app WORKDIR /usr/src/app
ARG NODE_ENV ARG NODE_ENV
ENV NODE_ENV $NODE_ENV ENV NODE_ENV $NODE_ENV
COPY package.json /usr/src/app/ COPY package.json /usr/src/app/
RUN npm install && npm cache clean RUN npm install
COPY . /usr/src/app
CMD [ "npm", "start" ] COPY . /usr/src/app
# replace this with your application's default port # replace this with your application's default port
EXPOSE 8888 EXPOSE 8888
CMD [ "npm", "start" ]
FROM node:7.9 FROM node:8.11
WORKDIR /usr/src/app WORKDIR /usr/src/app
ARG NODE_ENV ARG NODE_ENV
ENV NODE_ENV $NODE_ENV ENV NODE_ENV $NODE_ENV
COPY package.json /usr/src/app/ COPY package.json /usr/src/app/
RUN npm install && npm cache clean RUN npm install
COPY . /usr/src/app
CMD [ "npm", "start" ] COPY . /usr/src/app
# replace this with your application's default port # replace this with your application's default port
EXPOSE 8888 EXPOSE 8888
CMD [ "npm", "start" ]
\ No newline at end of file
FROM ruby:2.4-alpine FROM ruby:2.5-alpine
# Edit with nodejs, mysql-client, postgresql-client, sqlite3, etc. for your needs. # Edit with nodejs, mysql-client, postgresql-client, sqlite3, etc. for your needs.
# Or delete entirely if not needed. # 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 # throw errors if Gemfile has been modified since Gemfile.lock
RUN bundle config --global frozen 1 RUN bundle config --global frozen 1
...@@ -11,7 +11,10 @@ RUN mkdir -p /usr/src/app ...@@ -11,7 +11,10 @@ RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app WORKDIR /usr/src/app
COPY Gemfile Gemfile.lock /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 COPY . /usr/src/app
...@@ -21,4 +24,4 @@ COPY . /usr/src/app ...@@ -21,4 +24,4 @@ COPY . /usr/src/app
# For Rails # For Rails
EXPOSE 3000 EXPOSE 3000
CMD ["rails", "server"] CMD ["bundle", "exec", "rails", "server"]
FROM ruby:2.4 FROM ruby:2.5
# Edit with nodejs, mysql-client, postgresql-client, sqlite3, etc. for your needs. # Edit with nodejs, mysql-client, postgresql-client, sqlite3, etc. for your needs.
# Or delete entirely if not needed. # Or delete entirely if not needed.
...@@ -24,4 +24,4 @@ COPY . /usr/src/app ...@@ -24,4 +24,4 @@ COPY . /usr/src/app
# For Rails # For Rails
EXPOSE 3000 EXPOSE 3000
CMD ["rails", "server", "-b", "0.0.0.0"] CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0"]
...@@ -16,6 +16,8 @@ autom4te.cache ...@@ -16,6 +16,8 @@ autom4te.cache
/compile /compile
/config.guess /config.guess
/config.h.in /config.h.in
/config.log
/config.status
/config.sub /config.sub
/configure /configure
/configure.scan /configure.scan
......
vendor/ vendor/
node_modules/ node_modules/
npm-debug.log npm-debug.log
yarn-error.log
# Laravel 4 specific # Laravel 4 specific
bootstrap/compiled.php bootstrap/compiled.php
...@@ -10,11 +11,7 @@ app/storage/ ...@@ -10,11 +11,7 @@ app/storage/
public/storage public/storage
public/hot public/hot
storage/*.key storage/*.key
.env.*.php
.env.php
.env .env
Homestead.yaml Homestead.yaml
Homestead.json Homestead.json
/.vagrant
# Rocketeer PHP task runner and deployment package. https://github.com/rocketeers/rocketeer
.rocketeer/
...@@ -59,7 +59,7 @@ StyleCopReport.xml ...@@ -59,7 +59,7 @@ StyleCopReport.xml
# Files built by Visual Studio # Files built by Visual Studio
*_i.c *_i.c
*_p.c *_p.c
*_i.h *_h.h
*.ilk *.ilk
*.meta *.meta
*.obj *.obj
...@@ -327,3 +327,6 @@ ASALocalRun/ ...@@ -327,3 +327,6 @@ ASALocalRun/
# MFractors (Xamarin productivity tool) working folder # MFractors (Xamarin productivity tool) working folder
.mfractor/ .mfractor/
# Local History for Visual Studio
.localhistory/
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
variables: variables:
# This will supress any download for dependencies and plugins or upload messages which would clutter the console log. # 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. # `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: "-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"
# As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used # 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. # when running from the command line.
# `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins. # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins.
......
# Official language image. Look for the different tagged releases at: # Official language image. Look for the different tagged releases at:
# https://hub.docker.com/r/library/ruby/tags/ # 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. # Pick zero or more services to be used on all builds.
# Only needed when using a docker container to run your tests in. # Only needed when using a docker container to run your tests in.
......
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