Merge pull request #2 from stakater-docker/debug

fix user access issue

Author: waseem-h

Dockerfile

@@ -2,13 +2,20 @@ FROM debian:stretch
 
 RUN apt-get update && apt-get install -y git
 
+ARG USER=1001
+
+ADD [--chown=$USER:root] init.sh /
+RUN chmod +x /init.sh
+
+USER root
+
 RUN mkdir /root/.ssh/ && \
 	mkdir /repository && \
 	touch /root/.ssh/known_hosts && \
 	echo "\nStrictHostKeyChecking no" >> /etc/ssh/ssh_config
 
-ADD init.sh /
-RUN chmod +x /init.sh
+RUN chgrp -R 0 /root && \
+    chmod -R g=u /root
 
 # Clean up
 RUN apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

README.md

@@ -18,9 +18,11 @@ It is also required to mount a volume where the repository will be cloned from l
 In case of private repositories you also have to mount deployment SSH key authorized to clone code repository
 
 ### optional
-`TAG` - clone specified tag
+`REPO_TAG` - checkout specified tag
 
-`BRANCH` - clone specified branch (defaults to master)
+`REPO_REVISION` - checkout specified revision
+
+`REPO_BRANCH` - clone specified branch (defaults to master)
 
 `REPO_KEY` - RSA key filename (defaults to id_rsa)
 

init.sh

@@ -15,6 +15,8 @@ fi
 
 echo "repository : $REPO_LINK"
 echo "branch     : $REPO_BRANCH"
+echo "tag        : $REPO_TAG"
+echo "revision   : $REPO_REVISION"
 # check if credentials files exist
 if [[ -f "/key/$REPO_KEY" ]] ; then 
 	echo "key file   : $REPO_KEY"
@@ -27,12 +29,14 @@ if [ ! -z "$REPO_USER" ] && [ ! -z "$REPO_PASS" ]; then
 	# clone with repository username & password
 	echo "credentials: username and password"
 	git clone -b $REPO_BRANCH https://$REPO_USER:$REPO_PASS@$REPO_LINK /repository
-elif [[ ! -f "/root/.ssh/id_rsa" ]] ; then 
-	echo -e "\033[1;91mERROR:\033[0m REPO_USER, REPO_PASS env variables or SSH deployment key missing"
-	exit 1
 else
-	# clone public repository or using ssh deployment key
-	echo "credentials: RSA key"
+    if [[ ! -f "/root/.ssh/id_rsa" ]] ; then
+	    echo -e "\033[1;93mWARNING:\033[0m REPO_USER, REPO_PASS env variables or SSH deployment key missing"
+	else
+	    # clone public repository or using ssh deployment key
+	    echo "credentials: RSA key"
+	fi
+	ls -lah /repository
 	git clone -b $REPO_BRANCH $REPO_LINK /repository
 fi
 
@@ -42,3 +46,8 @@ if [ ! -z "$REPO_TAG" ]; then
 	git checkout tags/$REPO_TAG
 fi
 
+if [ ! -z "$REPO_REVISION" ]; then
+	cd /repository && \
+	echo "checking out repository revision: $REPO_REVISION"
+	git checkout $REPO_REVISION
+fi