diff --git a/dockerfile/mariadb.dockerfile b/dockerfile/mariadb.dockerfile index ae9ee78f6..375553d89 100644 --- a/dockerfile/mariadb.dockerfile +++ b/dockerfile/mariadb.dockerfile @@ -1,4 +1,4 @@ -FROM jeff1evesque/ml-base:0.7 +FROM jeff1evesque/ml-base:0.8 ## local variables ENV ENVIRONMENT=docker\ diff --git a/dockerfile/mongodb.dockerfile b/dockerfile/mongodb.dockerfile index 7d582f55f..64ab4c0c2 100644 --- a/dockerfile/mongodb.dockerfile +++ b/dockerfile/mongodb.dockerfile @@ -1,4 +1,4 @@ -FROM jeff1evesque/ml-base:0.7 +FROM jeff1evesque/ml-base:0.8 ## local variables ENV ENVIRONMENT docker diff --git a/dockerfile/nginx.dockerfile b/dockerfile/nginx.dockerfile index 77aff03ae..e32c14d64 100644 --- a/dockerfile/nginx.dockerfile +++ b/dockerfile/nginx.dockerfile @@ -1,4 +1,4 @@ -FROM jeff1evesque/ml-base:0.7 +FROM jeff1evesque/ml-base:0.8 ## local variables ENV ENVIRONMENT docker @@ -21,14 +21,14 @@ COPY puppet/environment/$ENVIRONMENT/modules/reverse_proxy $ROOT_PUPPET/code/mod ## ## provision with puppet: either build a web, or api nginx image. ## -## docker build --build-arg TYPE=api --build-arg RUN=false --build-arg VHOST=machine-learning-api.com --build-arg HOST_PORT=9090 --build-arg LISTEN_PORT=6000 -f nginx.dockerfile -t jeff1evesque/ml-nginx-api:0.7 . -## docker build --build-arg TYPE=web --build-arg RUN=false --build-arg VHOST=machine-learning-web.com --build-arg HOST_PORT=9090 --build-arg LISTEN_PORT=6000 -f nginx.dockerfile -t jeff1evesque/ml-nginx-web:0.7 . +## docker build --build-arg TYPE=api --build-arg RUN=false --build-arg VHOST=machine-learning-api.com --build-arg HOST_PORT=9090 --build-arg LISTEN_PORT=6000 -f nginx.dockerfile -t jeff1evesque/ml-nginx-api:0.8 . +## docker build --build-arg TYPE=web --build-arg RUN=false --build-arg VHOST=machine-learning-web.com --build-arg HOST_PORT=9090 --build-arg LISTEN_PORT=6000 -f nginx.dockerfile -t jeff1evesque/ml-nginx-web:0.8 . ## -## docker build --build-arg TYPE=api --build-arg RUN=false -f nginx.dockerfile -t jeff1evesque/ml-nginx-api:0.7 . -## docker build --build-arg TYPE=web --build-arg RUN=false -f nginx.dockerfile -t jeff1evesque/ml-nginx-web:0.7 . +## docker build --build-arg TYPE=api --build-arg RUN=false -f nginx.dockerfile -t jeff1evesque/ml-nginx-api:0.8 . +## docker build --build-arg TYPE=web --build-arg RUN=false -f nginx.dockerfile -t jeff1evesque/ml-nginx-web:0.8 . ## -## docker run --hostname nginx-api --name nginx-api -d jeff1evesque/ml-nginx-api:0.7 -## docker run --hostname nginx-web --name nginx-web -d jeff1evesque/ml-nginx-web:0.7 +## docker run --hostname nginx-api --name nginx-api -d jeff1evesque/ml-nginx-api:0.8 +## docker run --hostname nginx-web --name nginx-web -d jeff1evesque/ml-nginx-web:0.8 ## RUN $PUPPET apply -e "class { reverse_proxy: \ run => 'false', \ diff --git a/dockerfile/redis.dockerfile b/dockerfile/redis.dockerfile index 9282a7918..f9dd5d58d 100644 --- a/dockerfile/redis.dockerfile +++ b/dockerfile/redis.dockerfile @@ -1,4 +1,4 @@ -FROM jeff1evesque/ml-base:0.7 +FROM jeff1evesque/ml-base:0.8 ## local variables ENV ENVIRONMENT docker diff --git a/dockerfile/sklearn.dockerfile b/dockerfile/sklearn.dockerfile index b14a49e04..5945a082d 100644 --- a/dockerfile/sklearn.dockerfile +++ b/dockerfile/sklearn.dockerfile @@ -1,4 +1,4 @@ -FROM jeff1evesque/ml-base:0.7 +FROM jeff1evesque/ml-base:0.8 ## local variables ENV ENVIRONMENT docker diff --git a/dockerfile/webserver.dockerfile b/dockerfile/webserver.dockerfile index 18003fdb4..ea1e6cef9 100644 --- a/dockerfile/webserver.dockerfile +++ b/dockerfile/webserver.dockerfile @@ -1,4 +1,4 @@ -FROM jeff1evesque/ml-sklearn:0.7 +FROM jeff1evesque/ml-sklearn:0.8 ## local variables ENV ENVIRONMENT docker @@ -24,7 +24,7 @@ COPY puppet/environment/$ENVIRONMENT/modules/webserver $ROOT_PUPPET/code/modules ## ## provision with puppet: either build a web, or api webserver image. ## -## docker build -f webserver.dockerfile -t jeff1evesque/ml-webserver:0.7 . +## docker build -f webserver.dockerfile -t jeff1evesque/ml-webserver:0.8 . ## RUN apt-get update && $PUPPET apply -e "class { webserver: \ run => false, \ @@ -34,8 +34,8 @@ RUN apt-get update && $PUPPET apply -e "class { webserver: \ ## ## executed everytime container starts ## -## docker run --hostname webserver-api --name webserver-api -d jeff1evesque/ml-webserver:0.7 api 0.0.0.0 6001 6 -## docker run --hostname webserver-web --name webserver-web -d jeff1evesque/ml-webserver:0.7 web 0.0.0.0 5001 6 +## docker run --hostname webserver-api --name webserver-api -d jeff1evesque/ml-webserver:0.8 api 0.0.0.0 6001 6 +## docker run --hostname webserver-web --name webserver-web -d jeff1evesque/ml-webserver:0.8 web 0.0.0.0 5001 6 ## docker run\ ## --name webserver\ ## --net=app_nw\ @@ -47,7 +47,7 @@ RUN apt-get update && $PUPPET apply -e "class { webserver: \ ## -v "${PROJECT_ROOT}/hiera:/var/machine-learning/hiera"\ ## -v "${PROJECT_ROOT}/brain:/var/machine-learning/brain"\ ## -v "${PROJECT_ROOT}/test:/var/machine-learning/test"\ -## -d jeff1evesque/ml-webserver:0.7\ +## -d jeff1evesque/ml-webserver:0.8\ ## test | sudo tee pytest.log ## WORKDIR $ROOT_PROJECT