diff --git a/.github/ISSUE_TEMPLATE/developer-onboarding.md b/.github/ISSUE_TEMPLATE/developer-onboarding.md index 92ae9e3a1..11b2d86fc 100644 --- a/.github/ISSUE_TEMPLATE/developer-onboarding.md +++ b/.github/ISSUE_TEMPLATE/developer-onboarding.md @@ -3,7 +3,7 @@ name: Developer Onboarding about: Onboarding steps for developers. title: 'Developer Onboarding: GH_HANDLE' labels: dev, onboarding -assignees: loganmeetsworld +assignees: abroddrick --- @@ -16,7 +16,7 @@ assignees: loganmeetsworld There are several tools we use locally that you will need to have. - [ ] [Install the cf CLI v7](https://docs.cloudfoundry.org/cf-cli/install-go-cli.html#pkg-mac) for the ability to deploy -- [ ] Make sure you have `gpg` >2.1.7. Run `gpg --version` to check. +- [ ] Make sure you have `gpg` >2.1.7. Run `gpg --version` to check. If not, [install gnupg](https://formulae.brew.sh/formula/gnupg) - [ ] Install the [Github CLI](https://cli.github.com/) ## Access @@ -80,6 +80,15 @@ You may need to add these two lines to your shell's rc file (e.g. `.bashrc` or ` GPG_TTY=$(tty) export GPG_TTY ``` +and then + +```bash +source ~/.bashrc +``` +or +```bash +source ~/.zshrc +``` ## Setting up developer sandbox diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index a62174345..3b418c4d5 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -16,6 +16,7 @@ jobs: || startsWith(github.head_ref, 'ko/') || startsWith(github.head_ref, 'gd/') || startsWith(github.head_ref, 'za/') + || startsWith(github.head_ref, 'rh/') || startsWith(github.head_ref, 'nl/') outputs: environment: ${{ steps.var.outputs.environment}} diff --git a/.github/workflows/migrate.yaml b/.github/workflows/migrate.yaml index f98664f9d..fbfc7f17a 100644 --- a/.github/workflows/migrate.yaml +++ b/.github/workflows/migrate.yaml @@ -16,6 +16,7 @@ on: - stable - staging - nl + - rh - za - gd - rb diff --git a/.github/workflows/reset-db.yaml b/.github/workflows/reset-db.yaml index 9bd420124..fea4f19e2 100644 --- a/.github/workflows/reset-db.yaml +++ b/.github/workflows/reset-db.yaml @@ -17,6 +17,7 @@ on: - stable - staging - nl + - rh - za - gd - rb diff --git a/docs/developer/README.md b/docs/developer/README.md index 73000f35a..b6938298c 100644 --- a/docs/developer/README.md +++ b/docs/developer/README.md @@ -18,6 +18,10 @@ If you're new to Django, see [Getting Started with Django](https://www.djangopro Visit the running application at [http://localhost:8080](http://localhost:8080). +Note: If you are using Windows, you may need to change your [line endings](https://docs.github.com/en/get-started/getting-started-with-git/configuring-git-to-handle-line-endings). If not, you may not be able to run manage.py. +* Unix based operating systems (like macOS or Linux) handle line separators [differently than Windows does](https://superuser.com/questions/374028/how-are-n-and-r-handled-differently-on-linux-and-windows). This can break bash scripts in particular. In the case of manage.py, it uses *#!/usr/bin/env python* to access the Python executable. Since the script is still thinking in terms of unix line seperators, it may look for the executable *python\r* rather than *python* (since Windows cannot read the carriage return on its own) - thus leading to the error `usr/bin/env: 'python\r' no such file or directory` +* If you'd rather not change this globally, add a `.gitattributes` file in the project root with `* text eol=lf` as the text content, and [refresh the repo](https://docs.github.com/en/get-started/getting-started-with-git/configuring-git-to-handle-line-endings#refreshing-a-repository-after-changing-line-endings) + ## Branch Conventions We use the branch convention of `initials/branch-topic` (ex: `lmm/fix-footer`). This allows for automated deployment to a developer sandbox namespaced to the initials. diff --git a/ops/manifests/manifest-rh.yaml b/ops/manifests/manifest-rh.yaml new file mode 100644 index 000000000..d8bf4cb77 --- /dev/null +++ b/ops/manifests/manifest-rh.yaml @@ -0,0 +1,29 @@ +--- +applications: +- name: getgov-rh + buildpacks: + - python_buildpack + path: ../../src + instances: 1 + memory: 512M + stack: cflinuxfs4 + timeout: 180 + command: ./run.sh + health-check-type: http + health-check-http-endpoint: /health + env: + # Send stdout and stderr straight to the terminal without buffering + PYTHONUNBUFFERED: yup + # Tell Django where to find its configuration + DJANGO_SETTINGS_MODULE: registrar.config.settings + # Tell Django where it is being hosted + DJANGO_BASE_URL: https://getgov-rh.app.cloud.gov + # Tell Django how much stuff to log + DJANGO_LOG_LEVEL: INFO + # default public site location + GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + routes: + - route: getgov-rh.app.cloud.gov + services: + - getgov-credentials + - getgov-rh-database diff --git a/src/registrar/config/settings.py b/src/registrar/config/settings.py index 8a854f63f..f6873b226 100644 --- a/src/registrar/config/settings.py +++ b/src/registrar/config/settings.py @@ -572,6 +572,7 @@ ALLOWED_HOSTS = [ "getgov-stable.app.cloud.gov", "getgov-staging.app.cloud.gov", "getgov-nl.app.cloud.gov", + "getgov-rh.app.cloud.gov", "getgov-za.app.cloud.gov", "getgov-gd.app.cloud.gov", "getgov-rb.app.cloud.gov",