Skip to content

Commit 7f97ea2

Browse files
author
D3strukt0r
committed
fix: Hub description update and more info to build output
1 parent d5a982d commit 7f97ea2

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@ jobs:
6666
file: src/Dockerfile
6767
platforms: linux/amd64,linux/arm64 # same as base image
6868
push: ${{ github.event_name != 'pull_request' && vars.DOCKERHUB_USERNAME != '' && env.dockerhub_token != '' }}
69+
sbom: true
6970
tags: ${{ steps.meta.outputs.tags }}
7071
labels: ${{ steps.meta.outputs.labels }}
72+
annotations: ${{ steps.meta.outputs.annotations }}
7173
cache-from: type=gha
7274
cache-to: type=gha,mode=max
7375

.github/workflows/dockerhub-description.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
# https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#example-using-secrets
1616

1717
env:
18-
dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
18+
dockerhub_user_token: ${{ secrets.DOCKERHUB_USER_TOKEN }}
1919

2020
steps:
2121
- uses: actions/checkout@v5
@@ -26,10 +26,11 @@ jobs:
2626
echo "repository=$(echo "${{ vars.IMAGE_NAME }}" | tr '[A-Z]' '[a-z]')" >> $GITHUB_OUTPUT
2727
2828
- uses: peter-evans/dockerhub-description@v5
29-
if: ${{ !env.ACT && vars.DOCKERHUB_USERNAME != '' && env.dockerhub_token != '' }}
29+
if: ${{ !env.ACT && vars.DOCKERHUB_USER_USERNAME != '' && env.dockerhub_user_token != '' }}
3030
with:
31-
username: ${{ vars.DOCKERHUB_USERNAME }}
32-
password: ${{ secrets.DOCKERHUB_TOKEN }}
31+
username: ${{ vars.DOCKERHUB_USER_USERNAME }}
32+
# OAT (Organisation Access Token) doesn't work yet, use PAT (Personal Access Token)
33+
password: ${{ secrets.DOCKERHUB_USER_TOKEN }}
3334
repository: ${{ steps.prep.outputs.repository }}
3435
# Input exceeding 100 characters will be truncated.
3536
short-description: ${{ github.event.repository.description }}

src/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ ARG VERDACCIO_VERSION=6
55

66
# Docker multi-stage build - https://docs.docker.com/develop/develop-images/multistage-build/
77
FROM node:24 AS builder
8+
#ARG BUILDKIT_SBOM_SCAN_STAGE=true
89

910
# npm docs
1011
# --install-strategy https://docs.npmjs.com/cli/v11/commands/npm-install#install-strategy

0 commit comments

Comments
 (0)