Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Healthchecks review #375

Merged
merged 3 commits into from
Feb 6, 2025
Merged

Healthchecks review #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0e1275
Replace legacy cont-init.d for Cantaloupe service
nigelgbanks Feb 6, 2025
5d9a6f7
Test compose projects require names.
nigelgbanks Feb 6, 2025
b119b7b
Bump github action upload artifact
nigelgbanks Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/grype.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:
with:
cache-read-only: false
arguments: ${{ inputs.image }}:grype ${{ inputs.digest }} --info
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: Grype Reports
name: ${{ inputs.image }} Grype Reports
path: build/**/*-grype.*
8 changes: 0 additions & 8 deletions cantaloupe/rootfs/etc/cont-init.d/01-set-api-secret.sh
View file
Open in desktop

This file was deleted.

Empty file added ...pe/rootfs/etc/s6-overlay/s6-rc.d/cantaloupe-defaults/dependencies.d/container-environment
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions cantaloupe/rootfs/etc/s6-overlay/s6-rc.d/cantaloupe-defaults/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions cantaloupe/rootfs/etc/s6-overlay/s6-rc.d/cantaloupe-defaults/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/scripts/cantaloupe-defaults.sh
Empty file added cantaloupe/rootfs/etc/s6-overlay/s6-rc.d/confd-oneshot/dependencies.d/cantaloupe-defaults
View file
Open in desktop
Empty file.
9 changes: 9 additions & 0 deletions cantaloupe/rootfs/etc/s6-overlay/scripts/cantaloupe-defaults.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/command/with-contenv bash
# shellcheck shell=bash
set -ex

# Set the default value for CANTALOUPE_ENDPOINT_API_SECRET if none provided.
DEFAULT_SECRET=$(openssl rand -hex 16)
cat <<EOF | /usr/local/bin/confd-import-environment.sh
CANTALOUPE_ENDPOINT_API_SECRET="{{ getenv "CANTALOUPE_ENDPOINT_API_SECRET" "${DEFAULT_SECRET}" }}"
EOF
1 change: 1 addition & 0 deletions cantaloupe/tests/ServiceHealthcheck/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
x-common: &common
restart: "no"

name: cantaloupe-servicehealthcheck
services:
cantaloupe:
<<: *common
Expand Down
Loading