Merge pull request #56 from infosiftr/pre-download-nginx

Explicitly invoke "passenger-config download-nginx-engine" during image build time to avoid the runtime trying to download NGINX

Author: yosifkit

3.1/passenger/Dockerfile

@@ -1,15 +1,18 @@
 FROM redmine:3.1
 
 ENV PASSENGER_VERSION 5.1.2
+
 RUN buildDeps=' \
 		make \
 	' \
 	&& set -x \
 	&& apt-get update && apt-get install -y --no-install-recommends $buildDeps && rm -rf /var/lib/apt/lists/* \
 	&& gem install passenger --version "$PASSENGER_VERSION" \
 	&& apt-get purge -y --auto-remove $buildDeps
+
+# pre-download the PassengerAgent and the NGINX engine
 RUN set -x \
 	&& passenger-config install-agent \
-	&& passenger-config install-standalone-runtime
+	&& passenger-config download-nginx-engine
 
 CMD ["passenger", "start"]

3.2/passenger/Dockerfile

@@ -1,15 +1,18 @@
 FROM redmine:3.2
 
 ENV PASSENGER_VERSION 5.1.2
+
 RUN buildDeps=' \
 		make \
 	' \
 	&& set -x \
 	&& apt-get update && apt-get install -y --no-install-recommends $buildDeps && rm -rf /var/lib/apt/lists/* \
 	&& gem install passenger --version "$PASSENGER_VERSION" \
 	&& apt-get purge -y --auto-remove $buildDeps
+
+# pre-download the PassengerAgent and the NGINX engine
 RUN set -x \
 	&& passenger-config install-agent \
-	&& passenger-config install-standalone-runtime
+	&& passenger-config download-nginx-engine
 
 CMD ["passenger", "start"]

3.3/passenger/Dockerfile

@@ -1,15 +1,18 @@
 FROM redmine:3.3
 
 ENV PASSENGER_VERSION 5.1.2
+
 RUN buildDeps=' \
 		make \
 	' \
 	&& set -x \
 	&& apt-get update && apt-get install -y --no-install-recommends $buildDeps && rm -rf /var/lib/apt/lists/* \
 	&& gem install passenger --version "$PASSENGER_VERSION" \
 	&& apt-get purge -y --auto-remove $buildDeps
+
+# pre-download the PassengerAgent and the NGINX engine
 RUN set -x \
 	&& passenger-config install-agent \
-	&& passenger-config install-standalone-runtime
+	&& passenger-config download-nginx-engine
 
 CMD ["passenger", "start"]

Dockerfile-passenger.template

@@ -9,8 +9,10 @@ RUN buildDeps=' \
 	&& apt-get update && apt-get install -y --no-install-recommends $buildDeps && rm -rf /var/lib/apt/lists/* \
 	&& gem install passenger --version "$PASSENGER_VERSION" \
 	&& apt-get purge -y --auto-remove $buildDeps
+
+# pre-download the PassengerAgent and the NGINX engine
 RUN set -x \
 	&& passenger-config install-agent \
-	&& passenger-config install-standalone-runtime
+	&& passenger-config download-nginx-engine
 
 CMD ["passenger", "start"]