Archived
Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
55ec39989a | ||
|
|
e643062b17 | ||
|
|
5fd5bf940b | ||
|
|
b7cbdd0f29 | ||
|
|
72854bb5fd |
@@ -40,7 +40,35 @@ jobs:
|
|||||||
mvn -B -ntp -s .gitea/ci-settings.xml -DskipFrontend=true verify
|
mvn -B -ntp -s .gitea/ci-settings.xml -DskipFrontend=true verify
|
||||||
|
|
||||||
# Build + Trivy on every run (PRs included), so a broken Dockerfile or a new HIGH/CRITICAL CVE
|
# Build + Trivy on every run (PRs included), so a broken Dockerfile or a new HIGH/CRITICAL CVE
|
||||||
# blocks the merge. Only the push is main-only.
|
# blocks the merge.
|
||||||
|
#
|
||||||
|
# A PULL REQUEST MUST NOT TOUCH THE :latest TAG. This runner builds on the host's Docker daemon —
|
||||||
|
# the same daemon the live container runs on — so retagging :latest IS a deployment: Watchtower
|
||||||
|
# compares the running container's image against :latest, finds they differ, and recreates the
|
||||||
|
# container from the locally built image. Gating only the push is not enough; the build is the
|
||||||
|
# deploy.
|
||||||
|
#
|
||||||
|
# The damage is not only that unmerged code ships. Reassigning :latest leaves the running
|
||||||
|
# container's old image untagged, and once that image is pruned Watchtower can no longer read it
|
||||||
|
# to compare against, so it gives up every cycle:
|
||||||
|
#
|
||||||
|
# Failed to retrieve container image info: No such image: sha256:…
|
||||||
|
# Unable to update container "/<name>": no available image info.
|
||||||
|
#
|
||||||
|
# That happened to bennett-portfolio on 2026-07-27: it sat on a four-day-old build, failing to
|
||||||
|
# update 720 times in twenty-four hours, reporting healthy throughout. It had to be recreated by
|
||||||
|
# hand. This repo has the same workflow and the same exposure.
|
||||||
|
#
|
||||||
|
# So a PR builds pr-<number>, which nothing watches. Trivy scans whatever was built, and the push
|
||||||
|
# step below still only runs off a PR.
|
||||||
|
- name: Choose the image tag
|
||||||
|
run: |
|
||||||
|
if [ "${{ github.event_name }}" = "pull_request" ]; then
|
||||||
|
echo "IMAGE_TAG=pr-${{ github.event.number }}" >> "$GITHUB_ENV"
|
||||||
|
else
|
||||||
|
echo "IMAGE_TAG=latest" >> "$GITHUB_ENV"
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Build image
|
- name: Build image
|
||||||
env:
|
env:
|
||||||
DOCKER_BUILDKIT: "1"
|
DOCKER_BUILDKIT: "1"
|
||||||
@@ -51,17 +79,17 @@ jobs:
|
|||||||
--secret id=maven_user,env=MAVEN_USER \
|
--secret id=maven_user,env=MAVEN_USER \
|
||||||
--secret id=maven_token,env=MAVEN_TOKEN \
|
--secret id=maven_token,env=MAVEN_TOKEN \
|
||||||
--build-arg GIT_SHA=${{ github.sha }} \
|
--build-arg GIT_SHA=${{ github.sha }} \
|
||||||
-t git.thebennett.net/reformedwitness/rwn-website:latest -t git.thebennett.net/reformedwitness/rwn-website:${{ github.sha }} .
|
-t "git.thebennett.net/reformedwitness/rwn-website:$IMAGE_TAG" -t git.thebennett.net/reformedwitness/rwn-website:${{ github.sha }} .
|
||||||
|
|
||||||
- name: Scan image (Trivy)
|
- name: Scan image (Trivy)
|
||||||
run: |
|
run: |
|
||||||
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock \
|
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock \
|
||||||
aquasec/trivy:latest image --scanners vuln --severity HIGH,CRITICAL --ignore-unfixed --no-progress \
|
aquasec/trivy:latest image --scanners vuln --severity HIGH,CRITICAL --ignore-unfixed --no-progress \
|
||||||
git.thebennett.net/reformedwitness/rwn-website:latest || true
|
"git.thebennett.net/reformedwitness/rwn-website:$IMAGE_TAG" || true
|
||||||
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock \
|
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock \
|
||||||
aquasec/trivy:latest image --scanners vuln --severity HIGH,CRITICAL --ignore-unfixed \
|
aquasec/trivy:latest image --scanners vuln --severity HIGH,CRITICAL --ignore-unfixed \
|
||||||
--pkg-types library --exit-code 1 --no-progress \
|
--pkg-types library --exit-code 1 --no-progress \
|
||||||
git.thebennett.net/reformedwitness/rwn-website:latest
|
"git.thebennett.net/reformedwitness/rwn-website:$IMAGE_TAG"
|
||||||
|
|
||||||
# Publish only on a real push to main (or manual dispatch) — never from a pull request.
|
# Publish only on a real push to main (or manual dispatch) — never from a pull request.
|
||||||
- name: Push image
|
- name: Push image
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"react": "^19.2.7",
|
"react": "^19.2.7",
|
||||||
"react-dom": "^19.2.7",
|
"react-dom": "^19.2.7",
|
||||||
"lucide-react": "1.27.0"
|
"lucide-react": "1.28.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@tailwindcss/vite": "4.3.3",
|
"@tailwindcss/vite": "4.3.3",
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.thebennett.platform</groupId>
|
<groupId>net.thebennett.platform</groupId>
|
||||||
<artifactId>platform-parent</artifactId>
|
<artifactId>platform-parent</artifactId>
|
||||||
<version>0.1.9</version>
|
<version>0.1.10</version>
|
||||||
<relativePath/>
|
<relativePath/>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.thebennett.platform</groupId>
|
<groupId>net.thebennett.platform</groupId>
|
||||||
<artifactId>platform-bom</artifactId>
|
<artifactId>platform-bom</artifactId>
|
||||||
<version>0.1.9</version>
|
<version>0.1.10</version>
|
||||||
<type>pom</type>
|
<type>pom</type>
|
||||||
<scope>import</scope>
|
<scope>import</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|||||||
Reference in New Issue
Block a user