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.

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

[DO NOT MERGE]: Diff for scalableminds vs LINC webknossos deployments #26

Draft
wants to merge 58 commits into
base: ak-scalableminds-master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
95b1d24
Include documentation for local development and deployment specific t…
Jun 12, 2024
d16e6ac
disregard changes
Jun 12, 2024
9d28671
Include sample script for using Python
Jun 12, 2024
37d1b20
include more scripting
Jun 13, 2024
3142c5e
Merge branch 'master' into ak-dev
Jun 20, 2024
6e5e613
refine docs for local cli usage
Jun 20, 2024
80a6c84
bump examples and docs
Jun 20, 2024
3f9d97e
temp progress
Jun 21, 2024
8898c95
add logging statements
Jun 24, 2024
721dc5d
push container faster
Jun 24, 2024
d0f3087
more verbosity
Jun 24, 2024
a46253a
Resolve
Jun 24, 2024
79a1335
resolve try catch
Jun 24, 2024
bf82413
resolve try catch
Jun 24, 2024
02bf4b6
bump logic
Jun 24, 2024
7f4ebf4
speed up
Jun 24, 2024
bb23a3f
more perms for user
Jun 24, 2024
8100cba
bump backup docs and fossildb reference
Jun 25, 2024
cdc477f
include domain value in cookies
Jun 26, 2024
5696c2f
resolve build error
Jun 26, 2024
9c2d87a
temp disable of fingerprint
Jul 12, 2024
23dfc99
include cors representation
Jul 13, 2024
778bd3e
include more robust nginx
Jul 16, 2024
7be2c24
Include fossildb backup cronjob script
Jul 18, 2024
e0114ce
Update Annotations to be public by default
Jul 24, 2024
4e06104
update dockerfiles to find libdraco4 in CI
Jul 24, 2024
c5d71f8
Add team as default during annotation creation
Jul 30, 2024
07f2db4
resolve typo
Jul 31, 2024
5e4e68b
bump cors
Jul 31, 2024
51f5006
revert annotation to internal
Jul 31, 2024
44e45fb
bump correct fossildb backup
Jul 31, 2024
24d2a09
Attempt async behavior with s3datavault
Aug 1, 2024
945503b
include r5 in cors
Aug 2, 2024
bbf954c
Include postgres backup script
Aug 7, 2024
efc8997
Include example for crontab scheduling
Aug 8, 2024
3d51c26
a bit more progress
Aug 9, 2024
be1aca0
cleanup
Aug 9, 2024
a346d00
include GLACIER as default storage class for backups
Aug 9, 2024
7effb4e
include correct cors
Aug 9, 2024
5bb159a
Bump docs to include reference for how to create clone
Aug 23, 2024
f3c3f89
include staging.lincbrain.org in CORS conf
Aug 29, 2024
154c989
more docs
Aug 30, 2024
640b82c
more docs
Aug 30, 2024
de896fa
revise dc
Aug 30, 2024
4c8c854
progress
Sep 6, 2024
7e9a685
include new image with updated cors
Sep 12, 2024
8b906dd
bump
Sep 12, 2024
1586106
Bump thread count for r5.4xlarge
Sep 13, 2024
620fdcd
Bump thread count for r5.24xlarge
Sep 13, 2024
68768f1
Resolve cronjob and scripts for proper backup
Sep 13, 2024
b2e2b1c
Lincbrain WebKNOSSOS upstream sync
Sep 16, 2024
5bddadf
use ak-dev circle ci deploy
Sep 16, 2024
b99fc5e
Update UI with upstream changes included
Oct 7, 2024
58716c6
Include login updated text
Oct 7, 2024
0a1861f
Merge remote-tracking branch 'upstream/master' into ak-upstream-v2
Oct 10, 2024
cc6cbac
include most recent upstream from webknsosos
Oct 10, 2024
4f6afab
bump thresholds to 8
Oct 16, 2024
0c51af6
remove input fields on login panel, tune volume mag constants to 4
Oct 17, 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
Prev Previous commit
Next Next commit
bump correct fossildb backup
Aaron Kanzer authored and Aaron Kanzer committed Jul 31, 2024
commit 44e45fbb76f8eb274b148cc092c4d14ca15a9566
11 changes: 5 additions & 6 deletions backup_scripts/fossil_db_backup.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
#!/bin/bash
# crontab -e
# 0 2 * * * /home/ec2-user/opt/webknossos/fossil_db_cron_backup.sh >> /home/ec2-user/opt/webknossos/backup.log 2>&1

# Log file for debugging
LOGFILE="/home/ec2-user/opt/webknossos/backup.log"

{
echo "Starting backup at $(date +"%Y-%m-%d_%H-%M-%S")"

# Set the environment variables
export AWS_ACCESS_KEY_ID=""
export AWS_SECRET_ACCESS_KEY=""
export AWS_ACCESS_KEY_ID="ACCESS_KEY"
export AWS_SECRET_ACCESS_KEY="SECRET_KEY"
export AWS_DEFAULT_REGION="us-east-2"

# Define the subdirectory to back up and the S3 bucket name
@@ -21,8 +20,8 @@ LOGFILE="/home/ec2-user/opt/webknossos/backup.log"
# Set the working directory to where docker-compose.yml is located
cd /home/ec2-user/opt/webknossos

# Call the docker-compose step without TTY
/usr/local/bin/docker-compose run -T fossil-db-backup
# Call the docker-compose step without TTY -- detached state
/usr/local/bin/docker-compose up -d --no-deps --no-recreate fossil-db-backup

if [ $? -ne 0 ]; then
echo "Docker-compose step failed"