From 8c860f4571b4a390ce20dae19256e59a5db63c5d Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 12 Jan 2017 23:45:55 +0530 Subject: [PATCH 1/4] update node module to version `7.4.0-0` --- bitnami/express/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bitnami/express/Dockerfile b/bitnami/express/Dockerfile index 81d721a49b38..49ff2e87bc60 100644 --- a/bitnami/express/Dockerfile +++ b/bitnami/express/Dockerfile @@ -19,7 +19,10 @@ ENV STACKSMITH_STACK_ID="x07bd4s" \ STACKSMITH_STACK_NAME="Node.js for bitnami/bitnami-docker-express" \ STACKSMITH_STACK_PRIVATE="1" -RUN bitnami-pkg install node-7.0.0-0 --checksum 8049e447c9ac3cbf74b2ea7602e7126b6e5610b2f2c7b0e5f3ad18710eca4108 +# Install required system packages +RUN install_packages libc6 libssl1.0.0 libncurses5 libtinfo5 zlib1g libbz2-1.0 libreadline6 libstdc++6 libgcc1 ghostscript imagemagick libmysqlclient18 + +RUN bitnami-pkg install node-7.4.0-0 --checksum 25efb29dd2c4e4f459197401843e91185fb2e1d9a60d0b58ad350bf1254f8b15 ENV PATH=/opt/bitnami/node/bin:/opt/bitnami/python/bin:$PATH \ NODE_PATH=/opt/bitnami/node/lib/node_modules From 8bb18344fe2c257f4a3251b8c5f96b9b11d81c3e Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 12 Jan 2017 23:46:27 +0530 Subject: [PATCH 2/4] removed stacksmith metadata --- bitnami/express/Dockerfile | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/bitnami/express/Dockerfile b/bitnami/express/Dockerfile index 49ff2e87bc60..3e67eb7d7a59 100644 --- a/bitnami/express/Dockerfile +++ b/bitnami/express/Dockerfile @@ -1,24 +1,7 @@ -## BUILDING -## (from project root directory) -## $ docker build -t node-js-for-bitnami-bitnami-docker-express . -## -## RUNNING -## $ docker run -p 3000:3000 node-js-for-bitnami-bitnami-docker-express -## -## CONNECTING -## Lookup the IP of your active docker host using: -## $ docker-machine ip $(docker-machine active) -## Connect to the container at DOCKER_IP:3000 -## replacing DOCKER_IP for the IP of your active docker host - FROM gcr.io/stacksmith-images/minideb-buildpack:jessie-r8 MAINTAINER Bitnami -ENV STACKSMITH_STACK_ID="x07bd4s" \ - STACKSMITH_STACK_NAME="Node.js for bitnami/bitnami-docker-express" \ - STACKSMITH_STACK_PRIVATE="1" - # Install required system packages RUN install_packages libc6 libssl1.0.0 libncurses5 libtinfo5 zlib1g libbz2-1.0 libreadline6 libstdc++6 libgcc1 ghostscript imagemagick libmysqlclient18 @@ -27,8 +10,6 @@ RUN bitnami-pkg install node-7.4.0-0 --checksum 25efb29dd2c4e4f459197401843e9118 ENV PATH=/opt/bitnami/node/bin:/opt/bitnami/python/bin:$PATH \ NODE_PATH=/opt/bitnami/node/lib/node_modules -## STACKSMITH-END: Modifications below this line will be unchanged when regenerating - # ExpressJS template ENV BITNAMI_APP_NAME=express ENV BITNAMI_IMAGE_VERSION=4.14.0-r14 From d85b0e65f6930c6b2f246511d9cdf3151b139e30 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 12 Jan 2017 23:56:10 +0530 Subject: [PATCH 3/4] clean up Dockerfile --- bitnami/express/Dockerfile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/bitnami/express/Dockerfile b/bitnami/express/Dockerfile index 3e67eb7d7a59..92795fd7f3d1 100644 --- a/bitnami/express/Dockerfile +++ b/bitnami/express/Dockerfile @@ -2,22 +2,24 @@ FROM gcr.io/stacksmith-images/minideb-buildpack:jessie-r8 MAINTAINER Bitnami -# Install required system packages +# System packages required RUN install_packages libc6 libssl1.0.0 libncurses5 libtinfo5 zlib1g libbz2-1.0 libreadline6 libstdc++6 libgcc1 ghostscript imagemagick libmysqlclient18 +# Additional modules required RUN bitnami-pkg install node-7.4.0-0 --checksum 25efb29dd2c4e4f459197401843e91185fb2e1d9a60d0b58ad350bf1254f8b15 - ENV PATH=/opt/bitnami/node/bin:/opt/bitnami/python/bin:$PATH \ NODE_PATH=/opt/bitnami/node/lib/node_modules +RUN bitnami-pkg install express-generator-4.13.4-1 --checksum 937c865650282fa55c0e543166b95b0aab9e4cf891782cee056037697b2b64e3 +RUN npm install -g bower@1.8.0 + +# Install express +RUN bitnami-pkg install express-4.14.0-1 --checksum f98a7f8e85d038bb895d1105f6a0d995810b004f78b4fc0a0299237dc5070795 + # ExpressJS template ENV BITNAMI_APP_NAME=express ENV BITNAMI_IMAGE_VERSION=4.14.0-r14 -RUN bitnami-pkg install express-generator-4.13.4-1 --checksum 937c865650282fa55c0e543166b95b0aab9e4cf891782cee056037697b2b64e3 -RUN bitnami-pkg install express-4.14.0-1 --checksum f98a7f8e85d038bb895d1105f6a0d995810b004f78b4fc0a0299237dc5070795 -RUN npm install -g bower@1.8.0 - COPY rootfs/ / # The extra files that we bundle should use the Bitnami User From 4e0bb2cc26636a798a81092f5c35ad1c10bb6221 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 12 Jan 2017 23:56:19 +0530 Subject: [PATCH 4/4] bump image revision to `4.14.0-r15` --- bitnami/express/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/express/Dockerfile b/bitnami/express/Dockerfile index 92795fd7f3d1..6197a059008a 100644 --- a/bitnami/express/Dockerfile +++ b/bitnami/express/Dockerfile @@ -18,7 +18,7 @@ RUN bitnami-pkg install express-4.14.0-1 --checksum f98a7f8e85d038bb895d1105f6a0 # ExpressJS template ENV BITNAMI_APP_NAME=express -ENV BITNAMI_IMAGE_VERSION=4.14.0-r14 +ENV BITNAMI_IMAGE_VERSION=4.14.0-r15 COPY rootfs/ /