diff --git a/csharp-aspnet/Dockerfile b/csharp-aspnet/Dockerfile index fec3929..08f6293 100644 --- a/csharp-aspnet/Dockerfile +++ b/csharp-aspnet/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:1.1-sdk-msbuild +FROM microsoft/dotnet:2.0.4-sdk-2.1.3-jessie RUN mkdir /src WORKDIR /src ADD app/src/ /src diff --git a/csharp-aspnet/app/src/global.json b/csharp-aspnet/app/src/global.json index 9bead99..424cd16 100644 --- a/csharp-aspnet/app/src/global.json +++ b/csharp-aspnet/app/src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "1.0.0-rc4-004771" + "version": "2.1.3" } } diff --git a/docker/Dockerfile b/docker/Dockerfile index 07baf6c..4d54892 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ # Define the base image -FROM alpine:3.5 +FROM alpine:3.7 # Set environment variables ENV APP_HOME /app diff --git a/go-iris/Dockerfile b/go-iris/Dockerfile index 303e43c..845a3e5 100644 --- a/go-iris/Dockerfile +++ b/go-iris/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.8-alpine +FROM golang:1.9.2-alpine3.7 RUN apk add --no-cache git build-base diff --git a/java-spark/Dockerfile b/java-spark/Dockerfile index 3067172..56c7208 100644 --- a/java-spark/Dockerfile +++ b/java-spark/Dockerfile @@ -1,4 +1,4 @@ -FROM java:8 +FROM openjdk:9.0.1-11-jre-slim # Install maven RUN apt-get update @@ -9,5 +9,5 @@ Add . /spark RUN mvn package #Replace target/java-spark-jar-with-dependencies.jar with the name and description specified by the maven-assembly-plugin in your pom.xml -CMD ["/usr/lib/jvm/java-8-openjdk-amd64/bin/java", "-jar", "target/java-spark-jar-with-dependencies.jar"] +CMD ["/usr/lib/jvm/java-9-openjdk-amd64/bin/java", "-jar", "target/java-spark-jar-with-dependencies.jar"] diff --git a/java-spring-boot/Dockerfile b/java-spring-boot/Dockerfile index 92ddb0e..b83a586 100644 --- a/java-spring-boot/Dockerfile +++ b/java-spring-boot/Dockerfile @@ -1,4 +1,4 @@ -FROM java:8 +FROM openjdk:9.0.1-11-jre-slim # Install maven RUN apt-get update @@ -10,5 +10,5 @@ Add . /spring-boot RUN mvn package #Replace java-spring-boot-1.0-SNAPSHOT.jar with -.jar specified in your pom.xml -CMD ["/usr/lib/jvm/java-8-openjdk-amd64/bin/java", "-jar", "target/java-spring-boot-1.0-SNAPSHOT.jar"] +CMD ["/usr/lib/jvm/java-9-openjdk-amd64/bin/java", "-jar", "target/java-spring-boot-1.0-SNAPSHOT.jar"] diff --git a/js-angularjs/Dockerfile b/js-angularjs/Dockerfile index c7158c2..ff80ff8 100644 --- a/js-angularjs/Dockerfile +++ b/js-angularjs/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6 +FROM node:8 #Install deps RUN npm install -g http-server grunt-cli bower yo generator-karma generator-angular diff --git a/nodejs-express-sass/Dockerfile b/nodejs-express-sass/Dockerfile index 8f7966a..7039c48 100644 --- a/nodejs-express-sass/Dockerfile +++ b/nodejs-express-sass/Dockerfile @@ -1,4 +1,4 @@ -FROM mhart/alpine-node:7.6.0 +FROM node:8 WORKDIR /src # Add app source files ADD app/src /src diff --git a/nodejs-express/Dockerfile b/nodejs-express/Dockerfile index e4a4a9f..9b56c61 100644 --- a/nodejs-express/Dockerfile +++ b/nodejs-express/Dockerfile @@ -1,4 +1,4 @@ -FROM mhart/alpine-node:7.6.0 +FROM node:8 WORKDIR /src diff --git a/php-apache/Dockerfile b/php-apache/Dockerfile index 2c1edb2..79e372b 100644 --- a/php-apache/Dockerfile +++ b/php-apache/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.1.2-apache +FROM php:7.2-apache # Add default apache listener COPY app/conf/apache-config.conf /etc/apache2/sites-enabled/000-default.conf diff --git a/php-laravel/app/yarn.lock b/php-laravel/app/yarn.lock index dc92c6a..3911010 100644 --- a/php-laravel/app/yarn.lock +++ b/php-laravel/app/yarn.lock @@ -1164,7 +1164,7 @@ caniuse-lite@^1.0.30000784: capture-stack-trace@^1.0.0: version "1.0.0" - resolved "http://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d" + resolved "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d" cardinal@^1.0.0: version "1.0.0" @@ -1567,7 +1567,7 @@ create-ecdh@^4.0.0: create-error-class@^3.0.1: version "3.0.2" - resolved "http://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" + resolved "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" dependencies: capture-stack-trace "^1.0.0" @@ -3247,8 +3247,8 @@ inherits@2.0.1: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" internal-ip@1.2.0: version "1.2.0" @@ -5321,7 +5321,7 @@ rc@^1.1.2, rc@^1.1.7: read-all-stream@^3.0.0: version "3.1.0" - resolved "http://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa" + resolved "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa" dependencies: pinkie-promise "^2.0.0" readable-stream "^2.0.0" @@ -6357,7 +6357,7 @@ time-stamp@^2.0.0: timed-out@^3.0.0: version "3.1.3" - resolved "http://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217" + resolved "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217" timers-browserify@^2.0.4: version "2.0.4" diff --git a/python-flask/Dockerfile b/python-flask/Dockerfile index 01a9e3b..962da44 100644 --- a/python-flask/Dockerfile +++ b/python-flask/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3 +FROM python:3.7.0a3 # install required debian packages # add any package that is required after `python-dev`, end the line with \ diff --git a/react/Dockerfile b/react/Dockerfile index 8e53cb5..d2d9af0 100644 --- a/react/Dockerfile +++ b/react/Dockerfile @@ -1,6 +1,6 @@ FROM node:8 -#Alpine APK Manager had build issues so replaced them. +# Install build essential and python RUN apt-get update && apt-get install -y build-essential python #Install deps diff --git a/react/app/yarn.lock b/react/app/yarn.lock index 93ce74b..1a447e7 100644 --- a/react/app/yarn.lock +++ b/react/app/yarn.lock @@ -3127,8 +3127,8 @@ inherits@2.0.1: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" ini@^1.3.4, ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" inquirer@3.3.0, inquirer@^3.0.6: version "3.3.0" @@ -3686,6 +3686,10 @@ js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" +"js-tokens@^3.0.0 || ^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + js-yaml@^3.4.3, js-yaml@^3.7.0, js-yaml@^3.9.1: version "3.10.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc" @@ -3963,6 +3967,12 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1: dependencies: js-tokens "^3.0.0" +loose-envify@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + loud-rejection@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" @@ -4974,7 +4984,7 @@ promise@^7.1.1: dependencies: asap "~2.0.3" -prop-types@^15.5.10, prop-types@^15.6.0: +prop-types@^15.5.10: version "15.6.0" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" dependencies: @@ -4982,6 +4992,14 @@ prop-types@^15.5.10, prop-types@^15.6.0: loose-envify "^1.3.1" object-assign "^4.1.1" +prop-types@^15.6.2: + version "15.7.2" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.8.1" + proxy-addr@~2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec" @@ -5121,19 +5139,23 @@ react-dev-utils@^4.2.1: strip-ansi "3.0.1" text-table "0.2.0" -react-dom@16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044" +react-dom@^16.2.0: + version "16.14.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89" dependencies: - fbjs "^0.8.16" loose-envify "^1.1.0" object-assign "^4.1.1" - prop-types "^15.6.0" + prop-types "^15.6.2" + scheduler "^0.19.1" react-error-overlay@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-3.0.0.tgz#c2bc8f4d91f1375b3dad6d75265d51cd5eeaf655" +react-is@^16.8.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + react-scripts@1.0.17: version "1.0.17" resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-1.0.17.tgz#c30029123b561a060227af4d7797d50a222d3fbf" @@ -5177,14 +5199,13 @@ react-scripts@1.0.17: optionalDependencies: fsevents "1.1.2" -react@16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba" +react@^16.2.0: + version "16.14.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d" dependencies: - fbjs "^0.8.16" loose-envify "^1.1.0" object-assign "^4.1.1" - prop-types "^15.6.0" + prop-types "^15.6.2" read-all-stream@^3.0.0: version "3.1.0" @@ -5543,6 +5564,13 @@ sax@^1.2.1, sax@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" +scheduler@^0.19.1: + version "0.19.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + schema-utils@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf" diff --git a/schemaspy/Dockerfile b/schemaspy/Dockerfile index 4e4c719..5d67e40 100644 --- a/schemaspy/Dockerfile +++ b/schemaspy/Dockerfile @@ -1,8 +1,8 @@ -FROM java:8 +FROM openjdk:9.0.1-11-jre-slim RUN apt-get update -RUN apt-get -y install nginx +RUN apt-get -y install nginx wget RUN wget https://github.com/schemaspy/schemaspy/releases/download/v6.0.0-rc2/schemaspy-6.0.0-rc2.jar -O schemaSpy.jar diff --git a/serverless-functions/Dockerfile b/serverless-functions/Dockerfile index 3c64a36..b954f67 100644 --- a/serverless-functions/Dockerfile +++ b/serverless-functions/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2.7-alpine +FROM python:2.7.14-alpine3.7 WORKDIR /deploy @@ -11,4 +11,4 @@ COPY config.json /deploy/config.json COPY functions /deploy/functions -CMD ["python", "deploy.py"] \ No newline at end of file +CMD ["python", "deploy.py"]