squash! workspace v3.0.0 alpha

Signed-off-by: Steve Jeong <[email protected]>

Author: Steve Jeong

docker/base/.dockerignore

@@ -0,0 +1,8 @@
+# Docker
+Dockerfile.tags
+
+# fixups
+fixups/pkg
+
+# etc
+*.swp

docker/base/Dockerfile

@@ -18,12 +18,11 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 USER root
 WORKDIR /root
 COPY fixups fixups
-COPY id id
-COPY sudo sudo
-RUN chmod -R +x fixups id sudo
-RUN ./fixups/pkg
+RUN chmod -R +x fixups
+RUN ./fixups/preinst
 RUN ./fixups/ssh
-RUN rm -rf fixups
+RUN ./fixups/id
+RUN ./fixups/sudo
 
 USER ${ID}
 WORKDIR /home/${ID}

docker/base/Dockerfile.tags

@@ -8,10 +8,9 @@ WORKDIR /root
 COPY fixups fixups
 RUN chmod -R +x fixups
 RUN ./fixups/pkg
+RUN ./fixups/chid $ID
 # RUN ./fixups/..
-RUN ./id $ID
-RUN ./sudo $ID
-RUN rm -rf fixups id sudo
+RUN rm -rf fixups
 
 USER ${ID}
 WORKDIR /home/${ID}

docker/base/fixups/chid

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# add new id after install packages.
+# written by how2flow(Steve Jeong).
+
+OLD=:user
+NEW=$1
+
+if [ "${NEW}" != "user" ]; then
+  usermod -l "${OLD}" "${NEW}"
+  usermod -d /home/"${NEW}" -m "${NEW}" && \
+    mv /home/"${OLD}"/* /home/"${NEW}"
+  groupmod -n "${NEW}" "${OLD}"
+fi

docker/base/id renamed to docker/base/fixups/id

@@ -1,7 +1,4 @@
 #!/bin/bash
 
-apt-get update && apt-get install -y --no-install-recommends git sudo ssh tmux vim wget
-
-if [ -x "$(command -v brltty)" ]; then
-  apt-get remove brltty
-fi
+apt-get update && apt-get install -y --no-install-recommends \
+  /* package list */

docker/base/fixups/pkg

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+apt-get update && apt-get install -y --no-install-recommends git sudo ssh tmux vim wget
+
+if [ -x "$(command -v brltty)" ]; then
+  apt-get remove brltty
+fi

docker/base/fixups/preinst

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if [ -x "$(command -v sudo)" ]; then
+  usermod -aG sudo "${1:-user}"
+  touch /home/"${1:-user}"/.sudo_as_admin_successful
+fi

docker/base/fixups/sudo

@@ -1,19 +1,17 @@
 # Dockerfile
 FROM how2flow/workspace:base
 
-# vars
 ENV ID="jekyll"
 
-# root fixups
 USER root
 WORKDIR /root
 COPY fixups fixups
 RUN chmod -R +x fixups
 RUN ./fixups/pkg
-RUN ./id $ID
-RUN ./sudo $ID
-RUN rm -rf fixups id sudo
+RUN ./fixups/chid $ID
+# RUN ./fixups/..
+RUN rm -rf fixups
 
-# user fixups
 USER ${ID}
 WORKDIR /home/${ID}
+# user fixups ...