diff --git a/bitnami/express/docker-compose-mariadb.yml b/bitnami/express/docker-compose-mariadb.yml index 1607d23866c1..a4d52d502ee1 100644 --- a/bitnami/express/docker-compose-mariadb.yml +++ b/bitnami/express/docker-compose-mariadb.yml @@ -18,6 +18,7 @@ services: - SKIP_DB_WAIT=0 - SKIP_DB_MIGRATION=0 - SKIP_NPM_INSTALL=0 + - SKIP_BOWER_INSTALL=0 depends_on: - mariadb ports: diff --git a/bitnami/express/docker-compose-postgresql.yml b/bitnami/express/docker-compose-postgresql.yml index aa33543e71c1..241a496b4cab 100644 --- a/bitnami/express/docker-compose-postgresql.yml +++ b/bitnami/express/docker-compose-postgresql.yml @@ -18,6 +18,7 @@ services: - SKIP_DB_WAIT=0 - SKIP_DB_MIGRATION=0 - SKIP_NPM_INSTALL=0 + - SKIP_BOWER_INSTALL=0 depends_on: - postgresql ports: diff --git a/bitnami/express/docker-compose.yml b/bitnami/express/docker-compose.yml index 9c0a34231d6f..756664c4d196 100644 --- a/bitnami/express/docker-compose.yml +++ b/bitnami/express/docker-compose.yml @@ -16,6 +16,7 @@ services: - SKIP_DB_WAIT=0 - SKIP_DB_MIGRATION=0 - SKIP_NPM_INSTALL=0 + - SKIP_BOWER_INSTALL=0 depends_on: - mongodb ports: diff --git a/bitnami/express/rootfs/app-entrypoint.sh b/bitnami/express/rootfs/app-entrypoint.sh index 142c9ba474c7..af936e628433 100755 --- a/bitnami/express/rootfs/app-entrypoint.sh +++ b/bitnami/express/rootfs/app-entrypoint.sh @@ -85,6 +85,7 @@ add_dockerfile() { if [[ ! -f Dockerfile ]]; then cp -r /dist/Dockerfile.tpl Dockerfile sed -i 's/{{BITNAMI_IMAGE_VERSION}}/'"$BITNAMI_IMAGE_VERSION"'/g' Dockerfile + [[ ! -f bower.json ]] && sed -i '/^RUN bower install/d' Dockerfile fi if [[ ! -f .dockerignore ]]; then @@ -92,10 +93,17 @@ add_dockerfile() { fi } -npm_install() { - if ! [[ -n $SKIP_NPM_INSTALL && $SKIP_NPM_INSTALL -gt 0 ]] && [[ -f package.json ]] && ! dependencies_up_to_date; then - log "Installing/Updating Express dependencies (npm)" - npm install +install_packages() { + if ! dependencies_up_to_date; then + if ! [[ -n $SKIP_NPM_INSTALL && $SKIP_NPM_INSTALL -gt 0 ]] && [[ -f package.json ]]; then + log "Installing npm packages" + npm install + fi + + if ! [[ -n $SKIP_BOWER_INSTALL && $SKIP_BOWER_INSTALL -gt 0 ]] && [[ -f bower.json ]]; then + log "Installing bower packages" + bower install + fi fi } @@ -122,7 +130,7 @@ if [ "$1" == npm ] && [ "$2" == "start" -o "$2" == "run" ]; then add_dockerfile - npm_install + install_packages if ! fresh_container; then echo "#########################################################################" diff --git a/bitnami/express/rootfs/dist/Dockerfile.tpl b/bitnami/express/rootfs/dist/Dockerfile.tpl index 27c81c146df0..71457e113d3a 100644 --- a/bitnami/express/rootfs/dist/Dockerfile.tpl +++ b/bitnami/express/rootfs/dist/Dockerfile.tpl @@ -10,12 +10,14 @@ ENV NODE_ENV=production \ # Skip fetching dependencies and database migrations for production image ENV SKIP_DB_WAIT=0 \ SKIP_DB_MIGRATION=1 \ - SKIP_NPM_INSTALL=1 + SKIP_NPM_INSTALL=1 \ + SKIP_BOWER_INSTALL=1 COPY . /app RUN sudo chown -R bitnami: /app RUN npm install +RUN bower install EXPOSE 3000 CMD ["npm", "start"]