From 2dfd39cc1f355db3a0c2afd5de7fba0f7ee00e40 Mon Sep 17 00:00:00 2001 From: Miguel Martinez Date: Tue, 16 Jun 2015 11:58:22 -0700 Subject: [PATCH] Path one liner --- bitnami/nginx/Dockerfile | 17 +++++++++-------- bitnami/nginx/help.txt | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/bitnami/nginx/Dockerfile b/bitnami/nginx/Dockerfile index 1c090ef1f75f..b5c2a7949817 100644 --- a/bitnami/nginx/Dockerfile +++ b/bitnami/nginx/Dockerfile @@ -1,18 +1,19 @@ FROM bitnami/base-ubuntu:14.04 -MAINTAINER The Bitnami Team +MAINTAINER Bitnami -ENV BITNAMI_APP_NAME nginx -ENV BITNAMI_APP_DIR=$BITNAMI_PREFIX/$BITNAMI_APP_NAME -ENV BITNAMI_APP_VERSION 1.8.0-1 -ENV BITNAMI_APP_VOL_PREFIX=/bitnami/$BITNAMI_APP_NAME -ENV BITNAMI_APP_USER daemon +ENV BITNAMI_APP_NAME=nginx \ + BITNAMI_APP_USER=daemon \ + BITNAMI_APP_VERSION=1.8.0-1 + +ENV BITNAMI_APP_DIR=$BITNAMI_PREFIX/$BITNAMI_APP_NAME \ + BITNAMI_APP_VOL_PREFIX=/bitnami/$BITNAMI_APP_NAME + +ENV PATH=$BITNAMI_APP_DIR/sbin:$BITNAMI_PREFIX/common/bin:$PATH RUN sh $BITNAMI_PREFIX/install.sh COPY vhosts/* $BITNAMI_APP_DIR/conf.defaults/vhosts/ -ENV PATH $BITNAMI_APP_DIR/sbin:$BITNAMI_PREFIX/common/bin:$PATH - EXPOSE 80 443 VOLUME ["$BITNAMI_APP_VOL_PREFIX/conf", "$BITNAMI_APP_VOL_PREFIX/logs", "/app"] diff --git a/bitnami/nginx/help.txt b/bitnami/nginx/help.txt index 1cc7d878c4de..c808df55221b 100644 --- a/bitnami/nginx/help.txt +++ b/bitnami/nginx/help.txt @@ -13,8 +13,8 @@ tip#1: Mount $BITNAMI_APP_VOL_PREFIX/conf/vhosts with your configuration from the host to override the default configuration. COMMANDS: - bitnami-help: This page - check_updates: Check if a new version of the $BITNAMI_APP_NAME image is available + print-help: This page + check-updates: Check if a new version of the $BITNAMI_APP_NAME image is available Visit $GITHUB_PAGE for more information