mirror of
https://github.com/drwetter/testssl.sh.git
synced 2026-10-04 23:48:13 +02:00
Merge pull request #3163 from testssl/docker_baseimageupdate
Docker baseimageupdate
This commit is contained in:
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
# syntax=docker.io/docker/dockerfile:1
|
# syntax=docker.io/docker/dockerfile:1
|
||||||
|
|
||||||
ARG LEAP_VERSION=15.6
|
ARG LEAP_VERSION=16.0
|
||||||
ARG INSTALL_ROOT=/rootfs
|
ARG INSTALL_ROOT=/rootfs
|
||||||
|
|
||||||
FROM opensuse/leap:${LEAP_VERSION} AS builder
|
FROM opensuse/leap:${LEAP_VERSION} AS builder
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
# syntax=docker.io/docker/dockerfile:1
|
# syntax=docker.io/docker/dockerfile:1
|
||||||
|
|
||||||
FROM alpine:3.21 AS base-alpine
|
FROM alpine:3.24 AS base-alpine
|
||||||
RUN <<HEREDOC
|
RUN <<HEREDOC
|
||||||
apk add --no-cache bash procps drill coreutils libidn curl socat openssl xxd
|
apk add --no-cache bash procps drill coreutils libidn curl socat openssl xxd
|
||||||
|
|
||||||
|
|||||||
+9
-9
@@ -3,7 +3,7 @@
|
|||||||
Run the image with `testssl.sh` options appended (default is `--help`). The container entrypoint is already set to `testsl.sh` for convenience.
|
Run the image with `testssl.sh` options appended (default is `--help`). The container entrypoint is already set to `testsl.sh` for convenience.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker run --rm -it ghcr.io/testssl/testssl.sh:3.2 github.com
|
docker run --rm -it ghcr.io/testssl/testssl.sh:3.3dev github.com
|
||||||
```
|
```
|
||||||
|
|
||||||
### Output files
|
### Output files
|
||||||
@@ -14,7 +14,7 @@ Use a volume bind mount to a local host directory to access the files outside of
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Writes the HTML output to the host path: /tmp/example.com_p443-<date>-<time>.html
|
# Writes the HTML output to the host path: /tmp/example.com_p443-<date>-<time>.html
|
||||||
docker run --rm -it -v /tmp:/data --workdir /data ghcr.io/testssl/testssl.sh:3.2 --htmlfile ./ example.com
|
docker run --rm -it -v /tmp:/data --workdir /data ghcr.io/testssl/testssl.sh:3.3dev --htmlfile ./ example.com
|
||||||
```
|
```
|
||||||
|
|
||||||
> [!NOTE]
|
> [!NOTE]
|
||||||
@@ -30,7 +30,7 @@ You can pull the image from either of these registries:
|
|||||||
- GHCR: [`ghcr.io/testssl/testssl.sh`][image-registry::ghcr]
|
- GHCR: [`ghcr.io/testssl/testssl.sh`][image-registry::ghcr]
|
||||||
|
|
||||||
Supported tags:
|
Supported tags:
|
||||||
- `3.2` / `latest`
|
- `3.3dev` / `latest`
|
||||||
|
|
||||||
### Building the `testssl.sh` container image
|
### Building the `testssl.sh` container image
|
||||||
|
|
||||||
@@ -38,8 +38,8 @@ You can build with a standard `git clone` + `docker build`. Tagging the image wi
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
mkdir /tmp/testssl && cd /tmp/testssl
|
mkdir /tmp/testssl && cd /tmp/testssl
|
||||||
git clone --branch 3.2 --depth 1 https://github.com/testssl/testssl.sh .
|
git clone --branch 3.3dev --depth 1 https://github.com/testssl/testssl.sh .
|
||||||
docker build --tag localhost/testssl.sh:3.2 .
|
docker build --tag localhost/testssl.sh:3.3dev .
|
||||||
```
|
```
|
||||||
|
|
||||||
There are two base images supported:
|
There are two base images supported:
|
||||||
@@ -55,7 +55,7 @@ For contributors, if needing context on the [package selection has been document
|
|||||||
You can build with a single command instead via:
|
You can build with a single command instead via:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker build --tag localhost/testssl.sh:3.2 https://github.com/testssl/testssl.sh.git#3.2
|
docker build --tag localhost/testssl.sh:3.3dev https://github.com/testssl/testssl.sh.git#3.3dev
|
||||||
```
|
```
|
||||||
|
|
||||||
> [!NOTE]
|
> [!NOTE]
|
||||||
@@ -67,9 +67,9 @@ To build the Alpine image instead, additionally provide the ([alternative `Docke
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker build \
|
docker build \
|
||||||
--tag localhost/testssl.sh:3.2-alpine \
|
--tag localhost/testssl.sh:3.3dev-alpine \
|
||||||
--file https://raw.githubusercontent.com/testssl/testssl.sh/3.2/Dockerfile.alpine \
|
--file https://raw.githubusercontent.com/testssl/testssl.sh/3.3dev/Dockerfile.alpine \
|
||||||
https://github.com/testssl/testssl.sh.git#3.2
|
https://github.com/testssl/testssl.sh.git#3.3dev
|
||||||
```
|
```
|
||||||
|
|
||||||
[docker-docs::cli::cp]: https://docs.docker.com/reference/cli/docker/container/cp/
|
[docker-docs::cli::cp]: https://docs.docker.com/reference/cli/docker/container/cp/
|
||||||
|
|||||||
Reference in New Issue
Block a user