Compare commits

..

No commits in common. "main" and "v1.31.0+1" have entirely different histories.

4 changed files with 27 additions and 30 deletions

View File

@ -7,18 +7,15 @@ when:
steps: steps:
- name: security-build - name: security-build
image: quay.io/thegeeklab/wp-docker-buildx:6 image: quay.io/thegeeklab/wp-docker-buildx:5
settings: settings:
containerfile: Containerfile containerfile: Containerfile
output: type=oci,dest=oci/${CI_REPO_NAME},tar=false output: type=oci,dest=oci/${CI_REPO_NAME},tar=false
repo: thegeeklab/${CI_REPO_NAME} repo: thegeeklab/${CI_REPO_NAME}
cache_to: type=local,dest=oci/cache/${CI_REPO_NAME},mode=max cache_to: type=local,dest=oci/cache/${CI_REPO_NAME},mode=max
registry_config:
from_secret: DOCKER_REGISTRY_CONFIG_PULL
- name: security-scan - name: security-scan
image: docker.io/aquasec/trivy image: ghcr.io/aquasecurity/trivy
depends_on: security-build
commands: commands:
- trivy -v - trivy -v
- trivy image --input oci/${CI_REPO_NAME} - trivy image --input oci/${CI_REPO_NAME}
@ -28,11 +25,10 @@ steps:
TRIVY_NO_PROGRESS: "true" TRIVY_NO_PROGRESS: "true"
TRIVY_SEVERITY: HIGH,CRITICAL TRIVY_SEVERITY: HIGH,CRITICAL
TRIVY_TIMEOUT: 1m TRIVY_TIMEOUT: 1m
TRIVY_DB_REPOSITORY: docker.io/aquasec/trivy-db:2
- name: publish-dockerhub - name: publish-dockerhub
image: quay.io/thegeeklab/wp-docker-buildx:6 image: quay.io/thegeeklab/wp-docker-buildx:5
depends_on: security-scan group: container
settings: settings:
auto_tag: true auto_tag: true
containerfile: Containerfile containerfile: Containerfile
@ -51,8 +47,8 @@ steps:
- ${CI_REPO_DEFAULT_BRANCH} - ${CI_REPO_DEFAULT_BRANCH}
- name: publish-quay - name: publish-quay
image: quay.io/thegeeklab/wp-docker-buildx:6 image: quay.io/thegeeklab/wp-docker-buildx:5
depends_on: security-scan group: container
settings: settings:
auto_tag: true auto_tag: true
containerfile: Containerfile containerfile: Containerfile

View File

@ -8,11 +8,13 @@ when:
steps: steps:
- name: markdownlint - name: markdownlint
image: quay.io/thegeeklab/markdownlint-cli image: quay.io/thegeeklab/markdownlint-cli
group: test
commands: commands:
- markdownlint 'README.md' - markdownlint 'README.md'
- name: spellcheck - name: spellcheck
image: quay.io/thegeeklab/alpine-tools image: quay.io/thegeeklab/alpine-tools
group: test
commands: commands:
- spellchecker --files '_docs/**/*.md' 'README.md' -d .dictionary -p spell indefinite-article syntax-urls - spellchecker --files '_docs/**/*.md' 'README.md' -d .dictionary -p spell indefinite-article syntax-urls
environment: environment:
@ -20,17 +22,18 @@ steps:
- name: link-validation - name: link-validation
image: docker.io/lycheeverse/lychee image: docker.io/lycheeverse/lychee
group: test
commands: commands:
- lychee --no-progress --format detailed README.md - lychee --no-progress --format detailed README.md
- name: pushrm-dockerhub - name: pushrm-dockerhub
image: docker.io/chko/docker-pushrm:1 image: docker.io/chko/docker-pushrm:1
depends_on: [markdownlint, spellcheck, link-validation] secrets:
- source: docker_password
target: DOCKER_PASS
- source: docker_username
target: DOCKER_USER
environment: environment:
DOCKER_PASS:
from_secret: docker_password
DOCKER_USER:
from_secret: docker_username
PUSHRM_FILE: README.md PUSHRM_FILE: README.md
PUSHRM_SHORT: Custom image for Vaultwarden password manager PUSHRM_SHORT: Custom image for Vaultwarden password manager
PUSHRM_TARGET: thegeeklab/${CI_REPO_NAME} PUSHRM_TARGET: thegeeklab/${CI_REPO_NAME}
@ -42,10 +45,10 @@ steps:
- name: pushrm-quay - name: pushrm-quay
image: docker.io/chko/docker-pushrm:1 image: docker.io/chko/docker-pushrm:1
depends_on: [markdownlint, spellcheck, link-validation] secrets:
- source: quay_token
target: APIKEY__QUAY_IO
environment: environment:
APIKEY__QUAY_IO:
from_secret: quay_token
PUSHRM_FILE: README.md PUSHRM_FILE: README.md
PUSHRM_TARGET: quay.io/thegeeklab/${CI_REPO_NAME} PUSHRM_TARGET: quay.io/thegeeklab/${CI_REPO_NAME}
when: when:

View File

@ -13,12 +13,12 @@ steps:
settings: settings:
homeserver: homeserver:
from_secret: matrix_homeserver from_secret: matrix_homeserver
room_id: password:
from_secret: matrix_room_id from_secret: matrix_password
user_id: roomid:
from_secret: matrix_user_id from_secret: matrix_roomid
access_token: username:
from_secret: matrix_access_token from_secret: matrix_username
when: when:
- status: [success, failure] - status: [success, failure]

View File

@ -1,4 +1,4 @@
FROM docker.io/clux/muslrust:1.82.0-stable@sha256:9f88e922b2bfa7ff2252d61dc38be2ee5544d01bfa0acdc27b32c0a4a214c723 AS build FROM docker.io/clux/muslrust:1.79.0-stable@sha256:4ccce63c1227304544fb300a7ca0014782247b6204486e9ec273a349fbc493ad as build
ARG WEBVAULT_VERSION ARG WEBVAULT_VERSION
ARG VAULTWARDEN_VERSION ARG VAULTWARDEN_VERSION
@ -12,11 +12,9 @@ ARG DB=sqlite,postgresql
ARG TARGETPLATFORM ARG TARGETPLATFORM
# renovate: datasource=github-releases depName=dani-garcia/bw_web_builds versioning=loose # renovate: datasource=github-releases depName=dani-garcia/bw_web_builds versioning=loose
ENV WEBVAULT_VERSION="${WEBVAULT_VERSION:-v2024.6.2}" ENV WEBVAULT_VERSION="${WEBVAULT_VERSION:-v2024.5.1}"
# renovate: datasource=github-releases depName=dani-garcia/vaultwarden # renovate: datasource=github-releases depName=dani-garcia/vaultwarden
ENV VAULTWARDEN_VERSION="${VAULTWARDEN_VERSION:-1.32.4}" ENV VAULTWARDEN_VERSION="${VAULTWARDEN_VERSION:-1.31.0}"
ENV DATA_FOLDER=/tmp
WORKDIR /src WORKDIR /src
@ -46,7 +44,7 @@ RUN ldd target/$(cat rust_target)/release/vaultwarden && \
target/$(cat rust_target)/release/vaultwarden --help && \ target/$(cat rust_target)/release/vaultwarden --help && \
target/$(cat rust_target)/release/vaultwarden --version target/$(cat rust_target)/release/vaultwarden --version
FROM docker.io/alpine:3.20@sha256:1e42bbe2508154c9126d48c2b8a75420c3544343bf86fd041fb7527e017a4b4a FROM docker.io/alpine:3.20@sha256:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>" LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>" LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"