Merge pull request #8 from joez/develop

release v0.6

.dockerignore

@@ -14,3 +14,4 @@
 /MYMETA.*
 /ext
 /bin/cpanm
+Dockerfile*

Changes

@@ -1,3 +1,8 @@
+0.6 2017-09-23
+- gex: add more ticket id prefix
+- run container as non-root user
+- fix typo in Manifest.pm
+
 0.5 2017-08-30
 - gex: support file path for manifest report
 - gex: adjust column width in the meta worksheet

Dockerfile

@@ -1,11 +1,37 @@
 FROM perl:5.24
 
-MAINTAINER Joe Zheng
+#  docker run -it -v $(pwd):/work -e USER_ID=$(id -u) -e GROUP_ID=$(id -g) ptk
+LABEL author=joez
 
-COPY . /var/ptk
-RUN echo 'source /var/ptk/envsetup' >> ~/.bashrc && exec bash --login
+# deploy gosu
+RUN set -eux; \
+    arch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \
+    base="https://github.com/tianon/gosu/releases/download"; \
+    version=1.12; \
+    export GNUPGHOME="$(mktemp -d)"; \
+    gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
+    wget -O /usr/local/bin/gosu "${base}/${version}/gosu-${arch}"; \
+    wget -O /usr/local/bin/gosu.asc "${base}/${version}/gosu-${arch}.asc"; \
+    gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
+	gpgconf --kill all; \
+	rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
+	chmod +x /usr/local/bin/gosu; \
+	gosu --version; \
+	gosu nobody true
 
+# deploy ptk
+COPY . /opt/ptk
+RUN ["/bin/bash", "-c", "source /opt/ptk/envsetup"]
+
+# add user, its uid/gid will be modified by docker-entry later
+RUN groupadd -g 1000 -r joe \
+    && useradd -u 1000 -l -m -r -g joe -s /bin/bash -d /home/joe joe
+RUN echo 'source /opt/ptk/envsetup' >> /home/joe/.bashrc
+
+# here is the workspace
+RUN mkdir -p /work && chown joe:joe /work
 VOLUME ["/work"]
 WORKDIR /work
 
-CMD ["bash"]
+ENTRYPOINT ["/opt/ptk/docker-entry"]
+CMD ["bash"]

README.md

@@ -35,7 +35,9 @@ Build a Docker image named `ptk`
 
 Start a container and mount current directory as the workspace
 
-    docker run -it --rm -v `pwd`:/work ptk
+    docker run -it --rm -v $(pwd):/work -e USER_ID=$(id -u) -e GROUP_ID=$(id -g) ptk
+
+The `USER_ID` and `GROUP_ID` are used to make the uid/gid of the container matching the current host user, so that the files created has the right ownership
 
 # See also
 

bin/gex

@@ -1439,7 +1439,7 @@ sub parse_commit_message {
       next;
     }
 
-    if (/^(?:Bug|Issue|UTP-Id):\s*(.+)$/) {
+    if (/^(?:Bug|Issue|UTP-Id|Tracked-On):\s*(.+)$/) {
       for (split /\s/, $1) {
         if (/([A-Z-]*\d+)/) {
           push @{$d->{ticket_ids}}, $1;

docker-entry

@@ -0,0 +1,28 @@
+#!/bin/bash
+set -e
+
+# This allows the docker container manipulating files in the shared
+# volume owned by the USER_ID:GROUP_ID, e.g.
+#
+#  docker run -it -e USER_ID=$(id -u) -e GROUP_ID=$(id -g) ptk
+#
+# See also: https://github.com/moby/moby/issues/7198
+
+# allow the container to be started with "--user"
+if [[ "$(id -u)" == '0' ]]; then
+    # if the user is not specified, default as 1000:1000
+    [[ -z $USER_ID ]] && USER_ID=1000
+    [[ -z $GROUP_ID ]] && GROUP_ID=1000
+
+    NAME=joe
+
+    echo "Modify uid/gid of $NAME to $USER_ID:$GROUP_ID"
+    groupmod -g $GROUP_ID $NAME
+    usermod -u $USER_ID $NAME
+    chown -R $NAME:$NAME /home/$NAME
+
+    exec gosu $NAME:$NAME "$@"
+else
+    # do as-is as the user required
+    exec "$@"
+fi

lib/Ptk.pm

@@ -3,7 +3,7 @@
 package Ptk;
 use Ptk::Base -base;
 
-our $VERSION  = '0.5';
+our $VERSION  = '0.6';
 
 1;
 __END__

lib/Ptk/Manifest.pm

@@ -298,7 +298,7 @@ sub _parse {
   my $self = shift;
   my $file = shift or croak('no file');
 
-  crock("can't access manifest: $file") unless -e $file;
+  croak("can't access manifest: $file") unless -e $file;
 
   my $dom = Mojo::DOM->new(_p($file)->slurp);
   for my $e (_AM($dom)->children->each) {