Adding support for --user for Alpine based images and some minor clea…

…ning. #5

dist/alpine/Dockerfile-alpine

@@ -1,20 +1,28 @@
 FROM klakegg/hugo:base AS base
 
+FROM klakegg/hugo:base-certs as certs
 
 
-FROM klakegg/hugo:base-certs as certs
 
+FROM scratch as image
+
+COPY files /files
+COPY --from=base /bin/hugo /files/bin/hugo
+COPY --from=certs /etc/ssl/certs /files/etc/ssl/certs
 
 
-FROM alpine:3.7
+
+FROM alpine:3.8
 
 ENV HUGO_BIND="0.0.0.0" \
     HUGO_DESTINATION="/target" \
     HUGO_ENV="DEV"
 
-COPY --from=base /bin/hugo /bin/hugo
-COPY files /
-COPY --from=certs /etc/ssl/certs /etc/ssl/certs
+COPY --from=image /files /
+
+RUN apk --no-cache add busybox-suid bash bash-completion \
+ && mkdir /etc/bash_completion.d \
+ && hugo gen autocomplete > /dev/null
 
 EXPOSE 1313
 

dist/alpine/Dockerfile-ext-alpine

@@ -1,23 +1,31 @@
 FROM klakegg/hugo:base AS base
 
+FROM klakegg/hugo:base-certs as certs
+
 FROM ubuntu:18.04 AS ubuntu
 
-FROM klakegg/hugo:base-certs as certs
 
 
+FROM scratch as image
 
-FROM frolvlad/alpine-glibc:alpine-3.7
+COPY files /files
+COPY --from=base /bin/hugo-extended /files/bin/hugo
+COPY --from=certs /etc/ssl/certs /files/etc/ssl/certs
+COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.25 /files/usr/lib/libstdc++.so.6
+
+
+FROM frolvlad/alpine-glibc:alpine-3.8
 
 ENV HUGO_BIND="0.0.0.0" \
     HUGO_DESTINATION="/target" \
     HUGO_ENV="DEV"
 
-COPY --from=base /bin/hugo-extended /bin/hugo
-COPY files /
-COPY --from=certs /etc/ssl/certs /etc/ssl/certs
+RUN apk add --no-cache libstdc++ busybox-suid bash bash-completion
+
+COPY --from=image /files /
 
-RUN apk add --no-cache libstdc++
-COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.25 /usr/lib/libstdc++.so.6
+RUN mkdir /etc/bash_completion.d \
+ && hugo gen autocomplete > /dev/null
 
 EXPOSE 1313
 

dist/alpine/files/root/.bashrc → dist/alpine/files/etc/profile.d/hugo.sh

@@ -9,8 +9,3 @@ alias h="hugo"
 if [ "$HUGO_PANDOC" != "" ]; then
   alias pandoc="$HUGO_PANDOC"
 fi
-
-
-if [ -e /usr/share/bash-completion/bash_completion ]; then
-  . /usr/share/bash-completion/bash_completion
-fi

dist/alpine/files/etc/shadow

@@ -0,0 +1,28 @@
+root:$6$5sgrRV/p.pxx/ac/$XbuTxCOspW1Emdesk5HsML6CI8SiYjtJdDODAM26pixFEpw7T6yO3AAe0nOmWGJNpIvZ9Z6Ip4fHqz7YzSTue/:17852:0:::::
+bin:!::0:::::
+daemon:!::0:::::
+adm:!::0:::::
+lp:!::0:::::
+sync:!::0:::::
+shutdown:!::0:::::
+halt:!::0:::::
+mail:!::0:::::
+news:!::0:::::
+uucp:!::0:::::
+operator:!::0:::::
+man:!::0:::::
+postmaster:!::0:::::
+cron:!::0:::::
+ftp:!::0:::::
+sshd:!::0:::::
+at:!::0:::::
+squid:!::0:::::
+xfs:!::0:::::
+games:!::0:::::
+postgres:!::0:::::
+cyrus:!::0:::::
+vpopmail:!::0:::::
+ntp:!::0:::::
+smmsp:!::0:::::
+guest:!::0:::::
+nobody:!::0:::::

dist/alpine/files/run.sh

@@ -1,5 +1,13 @@
 #!/bin/sh
 
+if [ "$(id -u)" != "0" ]; then
+  su - root <<! > /dev/null
+alpine
+chown $(id -u).$(id -g) /src /target
+adduser -D -h /src -u $(id -u) hugo
+!
+fi
+
 case "$1" in
 
     # Commands from hugo

dist/alpine/files/shell.sh

@@ -1,15 +1,4 @@
 #!/bin/sh
 
-# Install bash
-apk --no-cache add bash bash-completion
-
-# Setting up autocomplete for hugo
-mkdir /etc/bash_completion.d
-hugo gen autocomplete > /dev/null
-
-# Notify user
-echo "Shell ready."
-echo
-
 # Start bash
-bash
+bash -l

dist/busybox/Dockerfile-busybox

@@ -1,24 +1,24 @@
 FROM klakegg/hugo:base AS base
 
+FROM klakegg/hugo:base-certs as certs
 
 
-FROM scratch AS files
 
-COPY --from=base /bin/hugo /bin/hugo
-COPY files /
+FROM scratch as image
 
+COPY files /files
+COPY --from=base /bin/hugo /files/bin/hugo
+COPY --from=certs /etc/ssl/certs /files/etc/ssl/certs
 
-FROM klakegg/hugo:base-certs as certs
 
 
-FROM busybox:1.28
+FROM busybox:1.29
 
 ENV HUGO_BIND="0.0.0.0" \
     HUGO_DESTINATION="/target" \
     HUGO_ENV="DEV"
 
-COPY --from=files / /
-COPY --from=certs /etc/ssl/certs /etc/ssl/certs
+COPY --from=image /files /
 
 EXPOSE 1313
 

dist/debian/Dockerfile-debian

@@ -2,14 +2,20 @@ FROM klakegg/hugo:base AS base
 
 
 
-FROM debian:9.4-slim
+FROM scratch as image
+
+COPY files /files
+COPY --from=base /bin/hugo /files/bin/hugo
+
+
+
+FROM debian:9.6-slim
 
 ENV HUGO_BIND="0.0.0.0" \
     HUGO_DESTINATION="/target" \
     HUGO_ENV="DEV"
 
-COPY --from=base /bin/hugo /bin/hugo
-COPY files /
+COPY --from=image /files /
 
 RUN apt update \
  && apt install -y bash-completion \

dist/debian/Dockerfile-ext-debian

@@ -2,14 +2,20 @@ FROM klakegg/hugo:base AS base
 
 
 
+FROM scratch as image
+
+COPY files /files
+COPY --from=base /bin/hugo-extended /files/bin/hugo
+
+
+
 FROM debian:9.4-slim
 
 ENV HUGO_BIND="0.0.0.0" \
     HUGO_DESTINATION="/target" \
     HUGO_ENV="DEV"
 
-COPY --from=base /bin/hugo-extended /bin/hugo
-COPY files /
+COPY --from=image /files /
 
 RUN apt update \
  && apt install -y curl gnupg bash-completion \

dist/debian/files/etc/profile.d/hugo.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+PS1="\e[1;32mhugo\e[m:\e[1;34m\w\e[m\$ "
+HOME=/src
+
+alias hugo="sh /run.sh"
+alias h="hugo"

dist/debian/files/shell.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # Start bash
-bash
+bash -l

dist/ubuntu/files/etc/profile.d/hugo.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+PS1="\e[1;32mhugo\e[m:\e[1;34m\w\e[m\$ "
+HOME=/src
+
+alias hugo="sh /run.sh"
+alias h="hugo"

dist/ubuntu/files/shell.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # Start bash
-bash
+bash -l