Skip to content

Commit 3fd081a

Browse files
merge, disable VEXs and bump tags
1 parent 82b9854 commit 3fd081a

4,165 files changed

Lines changed: 18 additions & 25809 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build-and-push-pg-image.yaml

Lines changed: 18 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ concurrency:
66

77
on:
88
push:
9-
branches: ['pg']
9+
branches: ["pg"]
1010
paths-ignore:
11-
- '**.md'
12-
- 'cloud-deployments/*'
13-
- 'images/**/*'
14-
- '.vscode/**/*'
15-
- '**/.env.example'
16-
- '.github/ISSUE_TEMPLATE/**/*'
17-
- 'embed/**/*' # Embed should be published to frontend (yarn build:publish) if any changes are introduced
18-
- 'server/utils/agents/aibitat/example/**/*' # Do not push new image for local dev testing of new aibitat images.
11+
- "**.md"
12+
- "cloud-deployments/*"
13+
- "images/**/*"
14+
- ".vscode/**/*"
15+
- "**/.env.example"
16+
- ".github/ISSUE_TEMPLATE/**/*"
17+
- "embed/**/*" # Embed should be published to frontend (yarn build:publish) if any changes are introduced
18+
- "server/utils/agents/aibitat/example/**/*" # Do not push new image for local dev testing of new aibitat images.
1919

2020
jobs:
2121
push_to_registries:
@@ -50,7 +50,7 @@ jobs:
5050
- name: Log in to Docker Hub
5151
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
5252
# Only login to the Docker Hub if the repo is mintplex/anythingllm, to allow for forks to build on GHCR
53-
if: steps.dockerhub.outputs.enabled == 'true'
53+
if: steps.dockerhub.outputs.enabled == 'true'
5454
with:
5555
username: ${{ secrets.DOCKER_USERNAME }}
5656
password: ${{ secrets.DOCKER_PASSWORD }}
@@ -63,7 +63,7 @@ jobs:
6363
${{ steps.dockerhub.outputs.enabled == 'true' && 'mintplexlabs/anythingllm' || '' }}
6464
tags: |
6565
type=raw,value=pg
66-
type=raw,value=pg-1.15.0
66+
type=raw,value=pg-1.16.0
6767
6868
- name: Build and push multi-platform Docker image
6969
uses: docker/build-push-action@v6
@@ -80,39 +80,11 @@ jobs:
8080
cache-to: type=gha,mode=max
8181
build-args: |
8282
"STORAGE_DIR=/storage"
83-
84-
# For Docker scout there are some intermediary reported CVEs which exists outside
85-
# of execution content or are unreachable by an attacker but exist in image.
86-
# We create VEX files for these so they don't show in scout summary.
87-
- name: Collect known and verified CVE exceptions
88-
id: cve-list
89-
run: |
90-
# Collect CVEs from filenames in vex folder
91-
CVE_NAMES=""
92-
for file in ./docker/vex/*.vex.json; do
93-
[ -e "$file" ] || continue
94-
filename=$(basename "$file")
95-
stripped_filename=${filename%.vex.json}
96-
CVE_NAMES+=" $stripped_filename"
97-
done
98-
echo "CVE_EXCEPTIONS=$CVE_NAMES" >> $GITHUB_OUTPUT
99-
shell: bash
10083
101-
# About VEX attestations https://docs.docker.com/scout/explore/exceptions/
102-
# Justifications https://github.com/openvex/spec/blob/main/OPENVEX-SPEC.md#status-justifications
103-
- name: Add VEX attestations
104-
env:
105-
CVE_EXCEPTIONS: ${{ steps.cve-list.outputs.CVE_EXCEPTIONS }}
106-
run: |
107-
echo $CVE_EXCEPTIONS
108-
curl -sSfL https://raw.githubusercontent.com/docker/scout-cli/main/install.sh | sh -s --
109-
for cve in $CVE_EXCEPTIONS; do
110-
for tag in "${{ join(fromJSON(steps.meta.outputs.json).tags, ' ') }}"; do
111-
echo "Attaching VEX exception $cve to $tag"
112-
docker scout attestation add \
113-
--file "./docker/vex/$cve.vex.json" \
114-
--predicate-type https://openvex.dev/ns/v0.2.0 \
115-
$tag
116-
done
117-
done
118-
shell: bash
84+
# VEX attestations are currently broken with docker scout when attaching
85+
# multiple attestations to multi-platform images. The second attachment
86+
# fails with "mismatched fs layers and diff ids".
87+
# TODO: Re-enable when docker/scout-cli fixes this upstream.
88+
# See: https://docs.docker.com/scout/explore/exceptions/
89+
# - name: Collect known and verified CVE exceptions
90+
# - name: Add VEX attestations

open-computer/.gitignore

Lines changed: 0 additions & 17 deletions
This file was deleted.

open-computer/.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)