Fix case where UID and GID are passed and added a test for that case.

.gitignore

@@ -1,4 +1,5 @@
 *\~
 .\#*
 \#*\#
-.config/
+.config/
+goss.yaml

build-n-test.sh

@@ -15,7 +15,12 @@ for image in "${images[@]}"; do
     docker build -t $tag -f $image.Dockerfile .
 
     echo "Testing image"
+    cp goss-default.yaml goss.yaml
     dgoss run $tag
+
+    echo "Testing again with UID and GID"
+    cp goss-uid-test.yaml goss.yaml
+    dgoss run -e UID=1001 -e GID=101 $tag
 done
 
 

common/entrypoint.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # Set defaults for uid and gid to not be root
-if [ -n $GID ]; then GID=100;  fi
-if [ -n $UID ]; then UID=1000; fi
+if [ -z $GID ]; then GID=100;  fi
+if [ -z $UID ]; then UID=1000; fi
 
 if [ "$GID" -ne "0" ]; then
 	GROUP=jdownloader

goss-default.yaml

@@ -0,0 +1,37 @@
+file:
+  /opt/JDownloader/JDownloader.jar:
+    exists: true
+    mode:
+      or:
+      - "0664"
+      - "0644"
+    filetype: file
+    contains: []
+  /opt/JDownloader/sevenzipjbinding1509.jar:
+    exists: true
+    mode:
+      or:
+      - "0664"
+      - "0644"
+    filetype: file
+    contains: []
+  /opt/JDownloader/sevenzipjbinding1509Linux.jar:
+    exists: true
+    mode:
+      or:
+      - "0664"
+      - "0644"
+    filetype: file
+    contains: []
+package:
+  ffmpeg:
+    installed: true
+user:
+  jdownloader:
+    exists: true
+    uid: 1000
+    gid: 100
+    groups:
+    - users
+    home: []
+    shell: /bin/false

goss-uid-test.yaml

@@ -0,0 +1,9 @@
+user:
+  jdownloader:
+    exists: true
+    uid: 1001
+    gid: 101
+    groups:
+    - jdownloader
+    home: []
+    shell: /bin/false

goss.yaml

@@ -1,28 +1,9 @@
-file:
-  /opt/JDownloader/JDownloader.jar:
-    exists: true
-    mode: "0644"
-    filetype: file
-    contains: []
-  /opt/JDownloader/sevenzipjbinding1509.jar:
-    exists: true
-    mode: "0664"
-    filetype: file
-    contains: []
-  /opt/JDownloader/sevenzipjbinding1509Linux.jar:
-    exists: true
-    mode: "0664"
-    filetype: file
-    contains: []
-package:
-  ffmpeg:
-    installed: true
 user:
   jdownloader:
     exists: true
-    uid: 1000
-    gid: 100
+    uid: 1001
+    gid: 101
     groups:
-    - users
+    - jdownloader
     home: []
     shell: /bin/false