-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Replace legacy cont-init.d for Cantaloupe service Changes the cantaloupe service init such that it respects service dependencies. This insures that the precedence for container environment follows what is outlined in the container-environment service. * Test compose projects require names. * Bump github action upload artifact
- Loading branch information
1 parent
041ce85
commit 5a61830
Showing
8 changed files
with
14 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Empty file.
1 change: 1 addition & 0 deletions
1
cantaloupe/rootfs/etc/s6-overlay/s6-rc.d/cantaloupe-defaults/type
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
oneshot |
1 change: 1 addition & 0 deletions
1
cantaloupe/rootfs/etc/s6-overlay/s6-rc.d/cantaloupe-defaults/up
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/etc/s6-overlay/scripts/cantaloupe-defaults.sh |
Empty file.
9 changes: 9 additions & 0 deletions
9
cantaloupe/rootfs/etc/s6-overlay/scripts/cantaloupe-defaults.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,7 @@ | |
x-common: &common | ||
restart: "no" | ||
|
||
name: cantaloupe-servicehealthcheck | ||
services: | ||
cantaloupe: | ||
<<: *common | ||
|