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
This commit is contained in:
Dirk 2024-09-05 17:44:33 +02:00
parent 1296279fa9
commit cebb52f698
4 changed files with 25 additions and 13 deletions

12
.github/dependabot.yml vendored Normal file
View File

@ -0,0 +1,12 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"

View File

@ -15,7 +15,7 @@ env:
jobs:
deploy:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Source checkout
@ -60,4 +60,3 @@ jobs:
labels: ${{ steps.docker_meta.outputs.labels }}
tags: |
ghcr.io/${{ github.repository }}:${{ env.BUILD_VERSION }}
ghcr.io/${{ github.repository }}:latest

View File

@ -1,16 +1,17 @@
FROM alpine:3.18
FROM alpine:3.20
WORKDIR /home/testssl/
RUN apk update && \
apk upgrade && \
apk add --no-cache bash procps drill coreutils libidn curl openssl1.1-compat && \
apk add --no-cache bash procps drill coreutils libidn curl openssl && \
addgroup testssl && \
adduser -G testssl -g "testssl user" -s /bin/bash -D testssl && \
ln -s /home/testssl/testssl.sh /usr/local/bin/ && \
mkdir -m 755 -p /home/testssl/etc /home/testssl/bin && \
ln -s /usr/bin/openssl1.1 /usr/bin/openssl
mkdir -m 755 -p /home/testssl/etc /home/testssl/bin
USER testssl
WORKDIR /home/testssl/
COPY --chown=testssl:testssl etc/. /home/testssl/etc/
COPY --chown=testssl:testssl bin/. /home/testssl/bin/

View File

@ -1,6 +1,8 @@
# Build using git repo
FROM alpine:3.18
FROM alpine:3.20
WORKDIR /home/testssl
ARG BUILD_VERSION
ARG ARCHIVE_URL=https://github.com/drwetter/testssl.sh/archive/
@ -8,16 +10,14 @@ ARG URL=https://github.com/drwetter/testssl.sh.git
RUN test -n "${BUILD_VERSION}" \
&& apk update \
&& apk add --no-cache bash procps drill coreutils libidn curl openssl1.1-compat git \
&& git clone --depth 1 --branch ${BUILD_VERSION} $URL /home/testssl \
&& apk add --no-cache bash procps drill coreutils libidn curl openssl git \
&& git clone --depth 1 --branch ${BUILD_VERSION} $URL /home/testssl \
&& addgroup testssl \
&& adduser -G testssl -g "testssl user" -s /bin/bash -D testssl \
&& ln -s /home/testssl/testssl.sh /usr/local/bin/ \
&& mkdir -m 755 -p /home/testssl/etc /home/testssl/bin \
&& ln -s /usr/bin/openssl1.1 /usr/bin/openssl
&& mkdir -m 755 -p /home/testssl/etc /home/testssl/bin
USER testssl
WORKDIR /home/testssl/
ENTRYPOINT ["testssl.sh"]