support for generatig ssh keys

adrian7 · adrian7 · commit e541e22b9714 · 2017-08-24T17:04:42.000+03:00
diff --git a/Dockerfile b/Dockerfile
@@ -18,6 +18,7 @@ RUN apk --no-cache add \
 		libpng-dev libjpeg-turbo-dev \
         wget \
         git \
+		openssh \
         nginx \
         ca-certificates \
         supervisor \
@@ -44,6 +45,8 @@ RUN apk --no-cache add \
 	
 #Configure
 
+RUN ssh-keygen -f /root/.ssh/base_id_rsa -t rsa -N ''
+
 COPY ./config-${BUILD_CONFIG}/nginx/host.conf /etc/nginx/sites-available/template.conf
 COPY ./config-${BUILD_CONFIG}/nginx/nginx.conf /etc/nginx/nginx.conf
 
diff --git a/build.sh b/build.sh
@@ -136,6 +136,12 @@ docker build -t $BUILDNAME \
 	.
 
 #Build custom images based on the previously built image
+
+if [ ! -z "$CUSTOMIZE" ] && [ ! -d "$PWD/custom/$CUSTOMIZE" ]; then 
+	warning "Folder ${i} can't be built. Folder missing!"
+	exit 1
+fi
+
 if [ -d "$PWD/custom" ]; then
 	
 	BUILD_DIR=$PWD/custom
diff --git a/custom/example/Dockerfile b/custom/example/Dockerfile
@@ -3,14 +3,19 @@ ARG BUILD_FROM=test
 
 FROM $BUILD_FROM
 
+# Generate image ssh key
+# Images with a key pair should not be pushed to public repositories.
+RUN rm -rf /root/.ssh/base_id_rsa* \
+	&& ssh-keygen -f /root/.ssh/id_rsa -t rsa -N ''
+
 #Start your customizations here
 
 #Example 
 
-#PostregSQL and zip support
+#install postgresql and zip support
 RUN set -ex \
 	&& apk --no-cache add postgresql-dev \
 	&& docker-php-ext-install pdo pdo_pgsql zip
 
 #Expose port 80
-EXPOSE 80
+EXPOSE 80
diff --git a/init-scripts/container.sh b/init-scripts/container.sh
@@ -1,13 +1,23 @@
 #!/usr/bin/env bash
 
+### Remove base image ssh key
+if [ -f "/root/.ssh/base_id_rsa" ] ; 
+then 
+	rm -rf /root/.ssh/base_id_rsa* 
+fi
+
+### Retrieve public ssh key (id_rsa.pub)
+if [ -f "/root/.ssh/id_rsa.pub" ] ;
+then
+	cp /root/.ssh/id_rsa.pub /var/local/id_rsa.pub
+	chown www-data /var/local/id_rsa.pub
+fi	 
+
 ### Set web server root folder according to env variable ###
 
 NGINX_HOST_TPL_FILE=/etc/nginx/sites-available/template.conf
 NGINX_HOST_CFG_FILE=/etc/nginx/sites-available/active.conf
 
-#PHP_VERSION=$(php -v | grep --only-matching --perl-regexp "\\d\.\\d+\.\\d+" | head -n 1)
-#PHP_MAJOR_VERSION=${PHP_VERSION:0:3}
-
 if [ -n "$SERVER_ROOT" ] ;
 then
 	echo "Server root set to ${SERVER_ROOT} ..."
diff --git a/init-scripts/welcome.php b/init-scripts/welcome.php
@@ -5,7 +5,8 @@
 	exit;
 }
 
-$boxType = ( $e = getenv('PHP_BUILD_CONFIG') ) ? $e : 'default';
+$sshPublicKey = ( $k = @file_get_contents('/var/local/id_rsa.pub') ) ? $k : NULL;
+$boxType 	  = ( $e = getenv('PHP_BUILD_CONFIG') ) ? $e : 'default';
 
 $nginxVersion = str_replace('nginx/', '', $_SERVER['SERVER_SOFTWARE']);
 $phpVersion	  = phpversion();
@@ -34,6 +35,18 @@
 				box-shadow: 2px 2px 8px rgba(0, 0, 0, .2);
 				border-radius: 4px;
 			}
+			
+			pre{
+			    word-wrap: break-word;
+				white-space: pre-wrap;
+			    overflow: auto;
+			    padding: 10px;
+			    border: 1px solid #e3e3e3;
+			    border-radius: 5px;
+			    background: #f4f4f4;
+			    height: auto;
+			    box-shadow: inset 0px 0px 11px rgba(0, 0, 0, 0.3);
+			}
 		</style>
 	</head>
 	<body>
@@ -49,7 +62,28 @@
 			<p>
 				<span style="color:green;">&#x25C9;</span>
 				PHP v<?php echo $phpVersion; ?>	
-			</p>	
+			</p>
+			
+			<?php if ( $sshPublicKey ): ?>
+				<h4>SSH Public Key</h4>
+			
+				<pre><?php echo $sshPublicKey; ?></pre>
+			<?php else: ?>
+				<p>
+					&#x2716; Could not retrieve ssh public key! 
+					If you want to run a customized version with a key pair, 
+					please customize your base image using template 
+					<a href="https://github.com/adrian7/docker-nginx-fpm/blob/master/custom/example/Dockerfile" target="_blank">
+						here
+					</a>.
+				</p>
+				<p style="color: #E73A38;">
+					<em>
+						&#x26A0; Note that, images with a key pair should not be pushed 
+						to public repositories.
+					</em>
+				</p>
+			<?php endif; ?>
 			
 			<p>&nbsp;</p>
 			<p style="font-size: .7em; text-align: center;">
