From 2655e91255ab9d14e3375dff0c23caab45b8a14e Mon Sep 17 00:00:00 2001 From: Dirk Wetter Date: Fri, 27 Nov 2020 17:00:34 +0100 Subject: [PATCH 1/2] Update Readme.md --- Readme.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Readme.md b/Readme.md index 3c128b3..c8fbbf7 100644 --- a/Readme.md +++ b/Readme.md @@ -60,7 +60,7 @@ Think of 3.1dev like a rolling release, see below. For the stable version help y Testssl.sh has minimal requirements. As stated you don't have to install or build anything. You can just run it from the pulled/cloned directory. Still if you don't want to pull the github repo to your directory of choice you can pull a container from dockerhub and run it: ``` -docker run --rm -ti drwetter/testssl.sh:3.1dev +docker run --rm -ti drwetter/testssl.sh ``` Or if you have cloned this repo you also can just ``cd`` to the INSTALLDIR and run @@ -73,7 +73,9 @@ For more please consult [Dockerfile.md](https://github.com/drwetter/testssl.sh/b ### Status -We're currently in the development phase, version 3.1dev. 3.1dev will eventually become 3.2. Bigger features are developed in a separate branch before merged into 3.1dev to avoid hiccups or inconsistencies. Albeit we try to keep 3.1dev as solid as possible things will certainly change in 3.1dev. So if you need stability the 3.0 branch is better for you. Think of the 3.1dev branch like a rolling release. +We're currently in the development phase, version 3.1dev. 3.1dev will eventually become 3.2. Bigger features are developed in a separate branch before merged into 3.1dev to avoid hiccups or inconsistencies. Albeit we try to keep 3.1dev as solid as possible things will certainly change in 3.1dev. Think of the 3.1dev branch like a rolling release. So if you need stability the 3.0 branch is better for you. + +Version 3.0.X receives bugfixes, labeled as 3.0.1, 3.0.2 and so on. This will happen until 3.2 is released. Support for 2.9.5 has been dropped. Supported is >= 3.0.x only. @@ -86,7 +88,7 @@ Support for 2.9.5 has been dropped. Supported is >= 3.0.x only. ### Contributing -Contributions are welcome! See [CONTRIBUTING.md](https://github.com/drwetter/testssl.sh/blob/3.0/CONTRIBUTING.md) for details. +Contributions are welcome! See [CONTRIBUTING.md](https://github.com/drwetter/testssl.sh/blob/3.1dev/CONTRIBUTING.md) for details. Please also have a look at the [Coding Convention](https://github.com/drwetter/testssl.sh/blob/3.1dev/Coding_Convention.md}. ### Bug reports From c88d22a0f06cbfdcc5a7237dba32d23ee1e5c5a4 Mon Sep 17 00:00:00 2001 From: Dirk Wetter Date: Fri, 27 Nov 2020 17:05:03 +0100 Subject: [PATCH 2/2] Update Dockerfile.md --- Dockerfile.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.md b/Dockerfile.md index ff79277..1eed4e3 100644 --- a/Dockerfile.md +++ b/Dockerfile.md @@ -36,14 +36,14 @@ You can pull the image from dockerhub and run: docker run --rm -t drwetter/testssl.sh --fs example.com ``` -Tags supported are: ``3.1dev`` and ``latest`` are the same, i.e. is the rolling release. ``3.0`` is the latest stable version from git which might have a few improvements over the released 3.0.X. +Supported tages are: ``3.1dev`` and ``latest`, which are the same, i.e. the rolling release. ``3.0`` is the latest stable version from git which might have a few improvements (see git log) over the released version 3.0.X. ``docker run --rm -t drwetter/testssl.sh:stable example.com``. -Keep in mind that any output file (--log, --html, --json etc.) will be created in the container. If you wish to have this created in a local directory you can mount a volume into the container and change the output prefix where the container user has write access to, e.g.: +Keep in mind that any output file (--log, --html, --json etc.) will be created within the container. If you wish to have this created in a local directory on your host you can mount a volume into the container and change the output prefix where the container user has write access to, e.g.: ``` docker run --rm -t -v /tmp:/data drwetter/testssl.sh --htmlfile /data/ example.com ``` -which writes the output to ``/tmp/example.com_p443--