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 + 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 + diff --git a/uploader/docker-compose.yml b/uploader/docker-compose.yml index 66cefd3..cd77018 100644 --- a/uploader/docker-compose.yml +++ b/uploader/docker-compose.yml @@ -10,8 +10,9 @@ services: - ./uploader/.env depends_on: - 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 @@ -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 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=