Skip to content

Commit

Permalink
#3287: update containers to '0.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
jeff1evesque committed Oct 2, 2018
1 parent ac907b7 commit 871915a
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion dockerfile/mariadb.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jeff1evesque/ml-base:0.7
FROM jeff1evesque/ml-base:0.8

## local variables
ENV ENVIRONMENT=docker\
Expand Down
2 changes: 1 addition & 1 deletion dockerfile/mongodb.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jeff1evesque/ml-base:0.7
FROM jeff1evesque/ml-base:0.8

## local variables
ENV ENVIRONMENT docker
Expand Down
14 changes: 7 additions & 7 deletions dockerfile/nginx.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jeff1evesque/ml-base:0.7
FROM jeff1evesque/ml-base:0.8

## local variables
ENV ENVIRONMENT docker
Expand All @@ -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', \
Expand Down
2 changes: 1 addition & 1 deletion dockerfile/redis.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jeff1evesque/ml-base:0.7
FROM jeff1evesque/ml-base:0.8

## local variables
ENV ENVIRONMENT docker
Expand Down
2 changes: 1 addition & 1 deletion dockerfile/sklearn.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jeff1evesque/ml-base:0.7
FROM jeff1evesque/ml-base:0.8

## local variables
ENV ENVIRONMENT docker
Expand Down
10 changes: 5 additions & 5 deletions dockerfile/webserver.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jeff1evesque/ml-sklearn:0.7
FROM jeff1evesque/ml-sklearn:0.8

## local variables
ENV ENVIRONMENT docker
Expand All @@ -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, \
Expand All @@ -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\
Expand All @@ -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
Expand Down

0 comments on commit 871915a

Please sign in to comment.