Skip to content

Commit cebb52f

Browse files
committed
Fix the Dockerfile env (hopefully)
* Upgrade both GHCR and Docker hub foile to alpine 3.2 * uses openssl version 3.3 as a alternative to option (default is still "ours" * docker 3.0 yml hast now ubuntu-22.04 (not EOL) + "latest" omitted
1 parent 1296279 commit cebb52f

4 files changed

Lines changed: 25 additions & 13 deletions

File tree

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
# Maintain dependencies for GitHub Actions
9+
- package-ecosystem: "github-actions"
10+
directory: "/"
11+
schedule:
12+
interval: "daily"

.github/workflows/docker-3.0.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515
jobs:
1616

1717
deploy:
18-
runs-on: ubuntu-20.04
18+
runs-on: ubuntu-22.04
1919

2020
steps:
2121
- name: Source checkout
@@ -60,4 +60,3 @@ jobs:
6060
labels: ${{ steps.docker_meta.outputs.labels }}
6161
tags: |
6262
ghcr.io/${{ github.repository }}:${{ env.BUILD_VERSION }}
63-
ghcr.io/${{ github.repository }}:latest

Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
FROM alpine:3.18
1+
FROM alpine:3.20
2+
3+
WORKDIR /home/testssl/
24

35
RUN apk update && \
46
apk upgrade && \
5-
apk add --no-cache bash procps drill coreutils libidn curl openssl1.1-compat && \
7+
apk add --no-cache bash procps drill coreutils libidn curl openssl && \
68
addgroup testssl && \
79
adduser -G testssl -g "testssl user" -s /bin/bash -D testssl && \
810
ln -s /home/testssl/testssl.sh /usr/local/bin/ && \
9-
mkdir -m 755 -p /home/testssl/etc /home/testssl/bin && \
10-
ln -s /usr/bin/openssl1.1 /usr/bin/openssl
11+
mkdir -m 755 -p /home/testssl/etc /home/testssl/bin
12+
1113

1214
USER testssl
13-
WORKDIR /home/testssl/
1415

1516
COPY --chown=testssl:testssl etc/. /home/testssl/etc/
1617
COPY --chown=testssl:testssl bin/. /home/testssl/bin/

Dockerfile.git

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# Build using git repo
22

3-
FROM alpine:3.18
3+
FROM alpine:3.20
4+
5+
WORKDIR /home/testssl
46

57
ARG BUILD_VERSION
68
ARG ARCHIVE_URL=https://github.com/drwetter/testssl.sh/archive/
79
ARG URL=https://github.com/drwetter/testssl.sh.git
810

911
RUN test -n "${BUILD_VERSION}" \
1012
&& apk update \
11-
&& apk add --no-cache bash procps drill coreutils libidn curl openssl1.1-compat git \
12-
&& git clone --depth 1 --branch ${BUILD_VERSION} $URL /home/testssl \
13+
&& apk add --no-cache bash procps drill coreutils libidn curl openssl git \
14+
&& git clone --depth 1 --branch ${BUILD_VERSION} $URL /home/testssl \
1315
&& addgroup testssl \
1416
&& adduser -G testssl -g "testssl user" -s /bin/bash -D testssl \
1517
&& ln -s /home/testssl/testssl.sh /usr/local/bin/ \
16-
&& mkdir -m 755 -p /home/testssl/etc /home/testssl/bin \
17-
&& ln -s /usr/bin/openssl1.1 /usr/bin/openssl
18+
&& mkdir -m 755 -p /home/testssl/etc /home/testssl/bin
1819

1920
USER testssl
20-
WORKDIR /home/testssl/
2121

2222
ENTRYPOINT ["testssl.sh"]
2323

0 commit comments

Comments
 (0)