Merge remote-tracking branch 'origin/master'

This commit is contained in:
2025-04-02 14:54:12 +02:00
2 changed files with 46 additions and 13 deletions

View File

@@ -1,15 +1,14 @@
name: Build project's laravel image
name: Build project image
on:
push:
branches: [ master ]
schedule:
# Run every Sunday at midnight
- cron: '0 0 * * 0'
env:
# Use docker.io for Docker Hub if empty
REGISTRY: cs-registry.ddnss.de
USER: chris
PASS: q',\H(Od:G3).Xv<#!5P
IMAGE: /ri-st/project
jobs:
Build-and-release-image:
@@ -23,23 +22,57 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Log into registry
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
registry: https://cs-git.ddnss.de
username: ${{ env.USER }}
password: ${{ env.PASS }}
username: ${{ vars.DOCKERHUB_USER }}
password: ${{ vars.DOCKERHUB_TOKEN }}
- name: Log into CS registry
uses: docker/login-action@v3
with:
registry: ${{ vars.CS_REGISTRY_URL }}
username: ${{ vars.CS_REGISTRY_USER }}
password: ${{ vars.CS_REGISTRY_PASS }}
- name: Log into local registry
uses: docker/login-action@v3
with:
registry: ${{ vars.LOCAL_REGISTRY_URL }}
username: ${{ vars.LOCAL_REGISTRY_USER }}
password: ${{ vars.LOCAL_REGISTRY_PASS }}
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@v5
with:
images: cs-git.ddnss.de/ri-st/project
images: ${{ secrets.REGISTRY_URL }}${{ env.IMAGE }}
- name: Build and push Docker image
uses: docker/build-push-action@v4
env:
ACTIONS_RUNTIME_TOKEN: ''
with:
tags: cs-git.ddnss.de/ri-st/project:master
tags: ${{ vars.LOCAL_REGISTRY_URL }}${{ env.IMAGE }}:latest
push: true
- name: Scan image
uses: anchore/scan-action@v6
id: scan
with:
image: ${{ vars.LOCAL_REGISTRY_URL }}${{ env.IMAGE }}:latest
fail-build: false
output-format: table
severity-cutoff: critical
registry-username: ${{ vars.LOCAL_REGISTRY_USER }}
registry-password: ${{ vars.LOCAL_REGISTRY_PASS }}
grype-version: 'v0.90.0'
- name: Inspect file
run: cat ${{ steps.scan.outputs.table }}
- name: Upload Artifact
uses: actions/upload-artifact@v3
with:
name: scan-result
path: ${{ steps.scan.outputs.table }}

View File

@@ -25,7 +25,7 @@
{{ __('invoice.No invoices') }}
</div>
<div class="mt-8" x-show="invoice.length != 0">
<div class="mt-8" x-show="invoices.length != 0">
<template x-for="(invoice, index) in invoices" x-bind="invoices">
<div class="cursor-pointer grid grid-cols-4 even:bg-gray-100 odd:bg-white"
:class="invoice.id == invoice_id ? 'font-bold' : ''"