From 0138890b7e17451dce28942a5741fa0aba396dd2 Mon Sep 17 00:00:00 2001 From: PusMinus0 Date: Wed, 21 Nov 2018 15:42:08 +0100 Subject: [PATCH 1/5] Update README.md --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 74d2822..d7a0e6f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,11 @@ -# headless-jd2-docker -Headless JDownloader 2 Docker Container +## Supported tags + * [latest, debian, v3-debian](https://github.com/PlusMinus0/headless-jd2-docker/blob/master/debian.Dockerfile) + * [alpine, v3-alpine](https://github.com/PlusMinus0/headless-jd2-docker/blob/master/alpine.Dockerfile) + * [![](https://images.microbadger.com/badges/version/plusminus/jdownloader2-headless:dev-debian.svg)](https://microbadger.com/images/plusminus/jdownloader2-headless:dev-debian "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/plusminus/jdownloader2-headless:dev-debian.svg)](https://microbadger.com/images/plusminus/jdownloader2-headless:dev-debian "Get your own image badge on microbadger.com")[dev-debian](https://github.com/PlusMinus0/headless-jd2-docker/blob/dev/debian.Dockerfile) + * [![](https://images.microbadger.com/badges/version/plusminus/jdownloader2-headless:dev-alpine.svg)](https://microbadger.com/images/plusminus/jdownloader2-headless:dev-alpine "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/plusminus/jdownloader2-headless:dev-alpine.svg)](https://microbadger.com/images/plusminus/jdownloader2-headless:dev-alpine "Get your own image badge on microbadger.com")[dev-alpine](https://github.com/PlusMinus0/headless-jd2-docker/blob/dev/alpine.Dockerfile) + * [![](https://images.microbadger.com/badges/version/plusminus/jdownloader2-headless:v2.1.svg)](https://microbadger.com/images/plusminus/jdownloader2-headless:v2.1 "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/plusminus/jdownloader2-headless:v2.1.svg)](https://microbadger.com/images/plusminus/jdownloader2-headless:v2.1 "Get your own image badge on microbadger.com")[v2.1](https://github.com/PlusMinus0/headless-jd2-docker/blob/v2.1/Dockerfile) + * [v2.0](https://github.com/PlusMinus0/headless-jd2-docker/blob/v2.0/Dockerfile) + ## Running the container 0. Become root if your user is not part of the docker group: From f39eb31253f4dcb16ae4aea4a7fc3758bce6e3ba Mon Sep 17 00:00:00 2001 From: PusMinus0 Date: Wed, 21 Nov 2018 15:55:27 +0100 Subject: [PATCH 2/5] Update README.md --- README.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index d7a0e6f..1d97713 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,14 @@ -## Supported tags - * [latest, debian, v3-debian](https://github.com/PlusMinus0/headless-jd2-docker/blob/master/debian.Dockerfile) - * [alpine, v3-alpine](https://github.com/PlusMinus0/headless-jd2-docker/blob/master/alpine.Dockerfile) - * [![](https://images.microbadger.com/badges/version/plusminus/jdownloader2-headless:dev-debian.svg)](https://microbadger.com/images/plusminus/jdownloader2-headless:dev-debian "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/plusminus/jdownloader2-headless:dev-debian.svg)](https://microbadger.com/images/plusminus/jdownloader2-headless:dev-debian "Get your own image badge on microbadger.com")[dev-debian](https://github.com/PlusMinus0/headless-jd2-docker/blob/dev/debian.Dockerfile) - * [![](https://images.microbadger.com/badges/version/plusminus/jdownloader2-headless:dev-alpine.svg)](https://microbadger.com/images/plusminus/jdownloader2-headless:dev-alpine "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/plusminus/jdownloader2-headless:dev-alpine.svg)](https://microbadger.com/images/plusminus/jdownloader2-headless:dev-alpine "Get your own image badge on microbadger.com")[dev-alpine](https://github.com/PlusMinus0/headless-jd2-docker/blob/dev/alpine.Dockerfile) - * [![](https://images.microbadger.com/badges/version/plusminus/jdownloader2-headless:v2.1.svg)](https://microbadger.com/images/plusminus/jdownloader2-headless:v2.1 "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/plusminus/jdownloader2-headless:v2.1.svg)](https://microbadger.com/images/plusminus/jdownloader2-headless:v2.1 "Get your own image badge on microbadger.com")[v2.1](https://github.com/PlusMinus0/headless-jd2-docker/blob/v2.1/Dockerfile) - * [v2.0](https://github.com/PlusMinus0/headless-jd2-docker/blob/v2.0/Dockerfile) +[![Build Status](https://travis-ci.com/PlusMinus0/headless-jd2-docker.svg?branch=master)](https://travis-ci.com/PlusMinus0/headless-jd2-docker) +# Supported tags + * [`latest`, `debian`, `v3-debian` (debian.Dockerfile)](https://github.com/PlusMinus0/headless-jd2-docker/blob/master/debian.Dockerfile) + * [`alpine`, `v3-alpine` (alpine.Dockerfile)](https://github.com/PlusMinus0/headless-jd2-docker/blob/master/alpine.Dockerfile) + * [`dev-debian` (debian.Dockerfile)](https://github.com/PlusMinus0/headless-jd2-docker/blob/dev/debian.Dockerfile) + * [`dev-alpine` (alpine.Dockerfile)](https://github.com/PlusMinus0/headless-jd2-docker/blob/dev/alpine.Dockerfile) + * [`v2.1` (Dockerfile)](https://github.com/PlusMinus0/headless-jd2-docker/blob/v2.1/Dockerfile) + * [`v2.0` (Dockerfile)](https://github.com/PlusMinus0/headless-jd2-docker/blob/v2.0/Dockerfile) -## Running the container +# Running the container 0. Become root if your user is not part of the docker group: ``` @@ -39,7 +40,7 @@ docker start jd2 ``` -## Optional environment variables +# Optional environment variables |Environment Variable|Description| |--------------------|-----------| |UID|Specifies the UID the daemon should run as. All created files will be owned by this UID. Defaults to 1000.| From 19f8bd5a41c222c37acb9765b7e90081fd76fd8e Mon Sep 17 00:00:00 2001 From: PusMinus0 Date: Thu, 22 Nov 2018 10:11:53 +0100 Subject: [PATCH 3/5] Fix case where UID and GID are passed and added a test for that case. --- .gitignore | 3 ++- build-n-test.sh | 5 +++++ common/entrypoint.sh | 4 ++-- goss-default.yaml | 37 +++++++++++++++++++++++++++++++++++++ goss-uid-test.yaml | 9 +++++++++ goss.yaml | 25 +++---------------------- 6 files changed, 58 insertions(+), 25 deletions(-) create mode 100644 goss-default.yaml create mode 100644 goss-uid-test.yaml diff --git a/.gitignore b/.gitignore index 4c06dab..73d6ef0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *\~ .\#* \#*\# -.config/ \ No newline at end of file +.config/ +goss.yaml \ No newline at end of file diff --git a/build-n-test.sh b/build-n-test.sh index f177150..3d0a77d 100755 --- a/build-n-test.sh +++ b/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 diff --git a/common/entrypoint.sh b/common/entrypoint.sh index f6d4282..6f2f589 100755 --- a/common/entrypoint.sh +++ b/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 diff --git a/goss-default.yaml b/goss-default.yaml new file mode 100644 index 0000000..edae253 --- /dev/null +++ b/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 diff --git a/goss-uid-test.yaml b/goss-uid-test.yaml new file mode 100644 index 0000000..12757b7 --- /dev/null +++ b/goss-uid-test.yaml @@ -0,0 +1,9 @@ +user: + jdownloader: + exists: true + uid: 1001 + gid: 101 + groups: + - jdownloader + home: [] + shell: /bin/false diff --git a/goss.yaml b/goss.yaml index 5fadbc4..12757b7 100644 --- a/goss.yaml +++ b/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 From a8f645ebe5b2c1e976ceb7cb94cadc5af330b4f0 Mon Sep 17 00:00:00 2001 From: PusMinus0 Date: Thu, 22 Nov 2018 10:13:12 +0100 Subject: [PATCH 4/5] Add newline to end fot .gitignore. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 73d6ef0..ba0d5b3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ .\#* \#*\# .config/ -goss.yaml \ No newline at end of file +goss.yaml From f26f567fd5a93d420d62b9546896031bc30894c0 Mon Sep 17 00:00:00 2001 From: PusMinus0 Date: Thu, 22 Nov 2018 10:14:35 +0100 Subject: [PATCH 5/5] Remove goss.yaml. should have been renamed. --- goss.yaml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 goss.yaml diff --git a/goss.yaml b/goss.yaml deleted file mode 100644 index 12757b7..0000000 --- a/goss.yaml +++ /dev/null @@ -1,9 +0,0 @@ -user: - jdownloader: - exists: true - uid: 1001 - gid: 101 - groups: - - jdownloader - home: [] - shell: /bin/false