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

Jump to bottom

Wait until db ready #231

Merged
merged 14 commits into from
Mar 15, 2024
Merged

Wait until db ready #231

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
723b767
modify api container to start after db healthy
jhazentia Apr 18, 2023
d06b316
simplify commands in create_localhost_cert
jhazentia Apr 18, 2023
22dac6c
use scos-actions trigger_api_restart_after_failed_powercycle branch
jhazentia Apr 20, 2023
1d2611e
Merge branch 'master' of https://github.com/NTIA/scos-sensor into wai…
jhazentia Apr 21, 2023
2d3a04d
update scos plugin versions
jhazentia Apr 21, 2023
2acb3db
Merge branch 'master' of https://github.com/NTIA/scos-sensor into wai…
jhazentia Nov 2, 2023
4d4b7f6
fix dependabot alert
jhazentia Nov 2, 2023
35ef89d
Merge branch 'master' of https://github.com/NTIA/scos-sensor into wai…
jhazentia Jan 2, 2024
89dcda0
change scos-tekrsa branch to test restart after power cycle sigan
jhazentia Jan 5, 2024
a6c1a46
revert back to latest scos-tekrsa version
jhazentia Jan 5, 2024
5c8ac96
Merge branch 'master' of https://github.com/NTIA/scos-sensor into wai…
jhazentia Feb 29, 2024
757bdef
remove duplicative line in requirements.in
jhazentia Mar 11, 2024
7e35aae
Merge branch 'master' of https://github.com/NTIA/scos-sensor into wai…
jhazentia Mar 12, 2024
84f189a
decrease db healthcheck interval to 2s
jhazentia Mar 15, 2024
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
9 changes: 8 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ services:
- '127.0.0.1:5432:5432'
volumes:
- ./dbdata:/var/lib/postgresql/data
healthcheck:
test: pg_isready -U postgres
interval: 10s
jhazentia marked this conversation as resolved.
Show resolved Hide resolved
timeout: 3s
retries: 1
start_period: 30s

api:
healthcheck:
Expand All @@ -20,7 +26,8 @@ services:
shm_size: '16gb'
restart: always
depends_on:
- db
db:
condition: service_healthy
labels:
autoheal: "true" # allow docker-autoheal to restart if unhealthy
image: smsntia/scos-sensor:${DOCKER_TAG} # DOCKER_TAG will always be 'latest' for GitHub source
Expand Down
6 changes: 2 additions & 4 deletions scripts/create_localhost_cert.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@ DNS.1 = localhost
IP.1 = 127.0.0.1" > localhost.ext
openssl x509 -req -passin pass:"changeme" -CA scostestca.pem -CAkey scostestca.key -in localhost.csr -out localhost.pem -days 365 -sha256 -CAcreateserial -extfile localhost.ext
cat localhost.key localhost.pem > localhost_combined.pem
cp scostestca.pem ../configs/certs/
mv ../configs/certs/scostestca.pem ../configs/certs/scos_test_ca.crt
cp localhost_combined.pem ../configs/certs/
mv ../configs/certs/localhost_combined.pem ../configs/certs/sensor01.pem
cp scostestca.pem ../configs/certs/scos_test_ca.crt
cp localhost_combined.pem ../configs/certs/sensor01.pem
2 changes: 1 addition & 1 deletion src/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ scos_tekrsa @ git+https://github.com/NTIA/[email protected]
# This is done to ensure the inclusion of specific security patches.
pyyaml>=5.4.0 # CVE-2020-14343
grpcio>=1.53.0 # CVE-2023-32732, CVE-2023-32731, CVE-2023-1428
urllib3>=1.26.18 # CVE-2023-45803
urllib3>=1.26.18 # CVE-2023-45803
Loading