diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 09c17a0..9fab39f 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -41,7 +41,7 @@ jobs: with: gcloud-token: ${{ secrets.GCR_TOKEN }} - name: Install poetry - uses: abatilo/actions-poetry@v2.1.0 + uses: abatilo/actions-poetry@v2.1.6 - run: | sudo apt-get -y install jq poetry run pip install uw-it-build-fingerprinter tox diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 67717b7..482f731 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -37,7 +37,7 @@ jobs: input_cluster: ${{ github.event.inputs.cluster }} steps: - uses: actions/checkout@v3 - - uses: abatilo/actions-poetry@v2.1.4 + - uses: abatilo/actions-poetry@v2.1.6 - run: | sudo apt-get -y install jq poetry install diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 448992e..28d1693 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -21,14 +21,14 @@ jobs: new-version: ${{ steps.update-version.outputs.new-version }} steps: - name: Python Poetry Action - uses: abatilo/actions-poetry@v2.1.4 + uses: abatilo/actions-poetry@v2.1.6 - uses: uwit-iam/actions/require-semver-guidance-label@0.1 id: guidance with: github-token: ${{ secrets.GITHUB_TOKEN }} - - uses: uwit-iam/actions/update-pr-branch-version@0.1 + - uses: uwit-iam/actions/update-pr-branch-version@0.1.16 with: github-token: ${{ env.GITHUB_TOKEN }} version-guidance: ${{ steps.guidance.outputs.guidance }} @@ -49,7 +49,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.ref }} - - uses: abatilo/actions-poetry@v2.1.4 + - uses: abatilo/actions-poetry@v2.1.6 - run: | sudo apt-get -y install jq poetry run pip install tox uw-it-build-fingerprinter diff --git a/.github/workflows/scheduled-maintenance.yml b/.github/workflows/scheduled-maintenance.yml index 807c4b3..07f626a 100644 --- a/.github/workflows/scheduled-maintenance.yml +++ b/.github/workflows/scheduled-maintenance.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: abatilo/actions-poetry@v2.1.3 + - uses: abatilo/actions-poetry@v2.1.6 - uses: UWIT-IAM/actions/configure-gcloud-docker@0.1 with: gcloud-token: ${{ secrets.GCR_TOKEN }} diff --git a/docker/docker-compose.app.yaml b/docker/docker-compose.app.yaml index 1f46255..72e867f 100644 --- a/docker/docker-compose.app.yaml +++ b/docker/docker-compose.app.yaml @@ -20,8 +20,8 @@ services: -c "/app/husky_directory/gunicorn.conf.py" "husky_directory.app:create_app()" volumes: - - ${UWCA_CERT_PATH}:/app/certificates:ro - - ${PWD}/husky_directory:/app/husky_directory + - ${UWCA_CERT_PATH}/:/app/certificates:ro + - ${PWD}/husky_directory/:/app/husky_directory redis: image: redis:latest command: redis-server --user uw-directory on +@all -@dangerous ~uw-directory:* >supersecret @@ -35,4 +35,4 @@ services: command: - '--config.file=/etc/prometheus/prometheus.yml' volumes: - - ${PWD}/docker/prometheus:/etc/prometheus/ + - ${PWD}/docker/prometheus/:/etc/prometheus/ diff --git a/docker/docker-compose.selenium.yml b/docker/docker-compose.selenium.yml index 0fe1058..00eac4f 100644 --- a/docker/docker-compose.selenium.yml +++ b/docker/docker-compose.selenium.yml @@ -20,7 +20,7 @@ services: # We want for test files to available on the selenium # container because tests may have files the test browser # needs to serve. - - ../selenium-tests:/selenium-tests + - ../selenium-tests/:/selenium-tests test-runner: build: @@ -34,8 +34,8 @@ services: uw_directory_url: ${uw_directory_url} USE_TEST_IDP: 'True' volumes: - - ../webdriver-report:/webdriver-report - - ../selenium-tests:/selenium-tests + - ../webdriver-report/:/webdriver-report + - ../selenium-tests/:/selenium-tests depends_on: - selenium entrypoint: /selenium-tests/entrypoint.sh diff --git a/husky_directory/settings/base.dotenv b/husky_directory/settings/base.dotenv index 61bf42e..5b504e6 100644 --- a/husky_directory/settings/base.dotenv +++ b/husky_directory/settings/base.dotenv @@ -9,4 +9,4 @@ SAML_ACS_PATH=/saml/login PROMETHEUS_METRIC_PREFIX=uw_directory SHOW_EXPERIMENTAL_FEATURES=False SESSION_FILE_DIR=/tmp/flask_session -USE_TEST_IDP=True +USE_TEST_IDP=False diff --git a/pyproject.toml b/pyproject.toml index e672c8a..506850d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "uw-husky-directory" -version = "2.2.3" +version = "2.2.4" description = "An updated version of the UW Directory" authors = ["Thomas Thorogood "] license = "MIT"