From ef4727317e6f5875d9565c81e7c4945494c88705 Mon Sep 17 00:00:00 2001 From: Luke Sikina Date: Thu, 9 May 2024 10:07:00 -0400 Subject: [PATCH 1/4] [ALS-0000] - Restart containers when ec2s get bonked --- uploader/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uploader/docker-compose.yml b/uploader/docker-compose.yml index 66cefd3..9fe27ff 100644 --- a/uploader/docker-compose.yml +++ b/uploader/docker-compose.yml @@ -10,6 +10,7 @@ services: - ./uploader/.env depends_on: - uploader-db + restart: always volumes: - /usr/local/docker-config/aws_uploads/:/gic_query_results/ networks: @@ -34,6 +35,7 @@ services: retries: 10 networks: - picsure + restart: always volumes: - /usr/local/pic-sure-services/uploader/data/seed.sql:/docker-entrypoint-initdb.d/seed.sql:ro - uploader-db-data:/var/lib/mysql From 17fffe2c850a68b9e65da0602de8b2bfce9cd85c Mon Sep 17 00:00:00 2001 From: Luke Sikina Date: Mon, 10 Jun 2024 14:28:02 -0400 Subject: [PATCH 2/4] [ALS-6666] - Fix upload root file system config path --- uploader/docker-compose.yml | 2 +- uploader/env-proto | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/uploader/docker-compose.yml b/uploader/docker-compose.yml index 9fe27ff..cd77018 100644 --- a/uploader/docker-compose.yml +++ b/uploader/docker-compose.yml @@ -12,7 +12,7 @@ services: - uploader-db restart: always volumes: - - /usr/local/docker-config/aws_uploads/:/gic_query_results/ + - $DOCKER_CONFIG_DIR/aws_uploads/:/gic_query_results/ networks: - hpdsNet - picsure diff --git a/uploader/env-proto b/uploader/env-proto index 9cce66e..c230b23 100644 --- a/uploader/env-proto +++ b/uploader/env-proto @@ -15,6 +15,7 @@ DATA_UPLOAD_DB_USER=datauploaduser DATA_UPLOAD_DB_ROOT_PASS=mycoolpassword FILE_SHARING_ROOT=/gic_query_results +DOCKER_CONFIG_DIR=/usr/local/picsure/config/ INSTITUTIONS=bch-dev HOME_INSTITUTION_NAME=bch-dev @@ -22,4 +23,4 @@ HOME_INSTITUTION_DISPLAY=BCH HOME_INSTITUTION_LONG_DISPLAY=Boston Children's Hospital DEBUG_VARS= -PROXY_VARS= \ No newline at end of file +PROXY_VARS= From dfd6062c3f98177166d9cbea078a702e8025f45e Mon Sep 17 00:00:00 2001 From: Luke Sikina Date: Tue, 11 Jun 2024 14:24:44 -0400 Subject: [PATCH 3/4] [ALS-6506] Make GH action to sync release with master --- .github/sync_release.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/sync_release.yml diff --git a/.github/sync_release.yml b/.github/sync_release.yml new file mode 100644 index 0000000..b29af51 --- /dev/null +++ b/.github/sync_release.yml @@ -0,0 +1,31 @@ +name: Update Test Branch + +on: + push: + branches: [main] + +permissions: write-all + +jobs: + sync: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Setup Git User + run: | + git config user.name "GitHub Action" + git config user.email "" + + - name: Update Test Branch + run: | + git checkout main + git fetch origin + git checkout release + git pull + git rebase origin/main + git push origin release --force + From 54d5c7030616f6a1d1fd86dfe4da809bf9a24b93 Mon Sep 17 00:00:00 2001 From: Luke Sikina Date: Tue, 11 Jun 2024 16:02:53 -0400 Subject: [PATCH 4/4] [ALS-0000] mv --- .github/workflows/sync_release.yml | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/sync_release.yml diff --git a/.github/workflows/sync_release.yml b/.github/workflows/sync_release.yml new file mode 100644 index 0000000..b29af51 --- /dev/null +++ b/.github/workflows/sync_release.yml @@ -0,0 +1,31 @@ +name: Update Test Branch + +on: + push: + branches: [main] + +permissions: write-all + +jobs: + sync: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Setup Git User + run: | + git config user.name "GitHub Action" + git config user.email "" + + - name: Update Test Branch + run: | + git checkout main + git fetch origin + git checkout release + git pull + git rebase origin/main + git push origin release --force +