Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion csharp-aspnet/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion csharp-aspnet/app/src/global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "1.0.0-rc4-004771"
"version": "2.1.3"
}
}
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Define the base image
FROM alpine:3.5
FROM alpine:3.7

# Set environment variables
ENV APP_HOME /app
Expand Down
2 changes: 1 addition & 1 deletion go-iris/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.8-alpine
FROM golang:1.9.2-alpine3.7

RUN apk add --no-cache git build-base

Expand Down
4 changes: 2 additions & 2 deletions java-spark/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM java:8
FROM openjdk:9.0.1-11-jre-slim

# Install maven
RUN apt-get update
Expand All @@ -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"]

4 changes: 2 additions & 2 deletions java-spring-boot/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM java:8
FROM openjdk:9.0.1-11-jre-slim

# Install maven
RUN apt-get update
Expand All @@ -10,5 +10,5 @@ Add . /spring-boot
RUN mvn package

#Replace java-spring-boot-1.0-SNAPSHOT.jar with <artifactId>-<version>.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"]

2 changes: 1 addition & 1 deletion js-angularjs/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion nodejs-express-sass/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mhart/alpine-node:7.6.0
FROM node:8
WORKDIR /src
# Add app source files
ADD app/src /src
Expand Down
2 changes: 1 addition & 1 deletion nodejs-express/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mhart/alpine-node:7.6.0
FROM node:8

WORKDIR /src

Expand Down
2 changes: 1 addition & 1 deletion php-apache/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions php-laravel/app/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -3247,8 +3247,8 @@ [email protected]:
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"

[email protected]:
version "1.2.0"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion python-flask/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion react/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
54 changes: 41 additions & 13 deletions react/app/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3127,8 +3127,8 @@ [email protected]:
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"

[email protected], inquirer@^3.0.6:
version "3.3.0"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -4974,14 +4984,22 @@ 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:
fbjs "^0.8.16"
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"
Expand Down Expand Up @@ -5121,19 +5139,23 @@ react-dev-utils@^4.2.1:
strip-ansi "3.0.1"
text-table "0.2.0"

[email protected]:
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"

[email protected]:
version "1.0.17"
resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-1.0.17.tgz#c30029123b561a060227af4d7797d50a222d3fbf"
Expand Down Expand Up @@ -5177,14 +5199,13 @@ [email protected]:
optionalDependencies:
fsevents "1.1.2"

[email protected]:
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"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions schemaspy/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions serverless-functions/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:2.7-alpine
FROM python:2.7.14-alpine3.7

WORKDIR /deploy

Expand All @@ -11,4 +11,4 @@ COPY config.json /deploy/config.json

COPY functions /deploy/functions

CMD ["python", "deploy.py"]
CMD ["python", "deploy.py"]