From 3414f33d72c07c1fcd7c56318f9e9e6bbc39eed9 Mon Sep 17 00:00:00 2001
From: Diana Stanley <dstanley@gitlab.com>
Date: Fri, 7 Sep 2018 22:26:32 -0700
Subject: Update templates and licenses for 11.3

---
 vendor/Dockerfile/Node-alpine.Dockerfile | 18 ++++++++++--------
 vendor/Dockerfile/OpenJDK.Dockerfile     | 14 +++++++++-----
 vendor/Dockerfile/Ruby-alpine.Dockerfile |  6 +++---
 3 files changed, 22 insertions(+), 16 deletions(-)

(limited to 'vendor/Dockerfile')

diff --git a/vendor/Dockerfile/Node-alpine.Dockerfile b/vendor/Dockerfile/Node-alpine.Dockerfile
index 5b9b495644a..24f92dd92cd 100644
--- a/vendor/Dockerfile/Node-alpine.Dockerfile
+++ b/vendor/Dockerfile/Node-alpine.Dockerfile
@@ -1,15 +1,17 @@
-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" ]
diff --git a/vendor/Dockerfile/OpenJDK.Dockerfile b/vendor/Dockerfile/OpenJDK.Dockerfile
index 8a2ae62d93b..c68420b453a 100644
--- a/vendor/Dockerfile/OpenJDK.Dockerfile
+++ b/vendor/Dockerfile/OpenJDK.Dockerfile
@@ -1,8 +1,12 @@
-FROM openjdk:9
+FROM maven:3.5-jdk-11 as BUILD
 
-COPY . /usr/src/myapp
-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"]
diff --git a/vendor/Dockerfile/Ruby-alpine.Dockerfile b/vendor/Dockerfile/Ruby-alpine.Dockerfile
index dffe9a65116..0f748d84b5d 100644
--- a/vendor/Dockerfile/Ruby-alpine.Dockerfile
+++ b/vendor/Dockerfile/Ruby-alpine.Dockerfile
@@ -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"]
-- 
cgit v1.2.3