Skip to content

Commit

Permalink
Merge pull request #61 from octodemo/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
tsviz authored Dec 8, 2024
2 parents 9231f87 + 9fc2164 commit a6f3d97
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 6 deletions.
5 changes: 3 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "RazorPagesMovie Dev Container",
"image": "mcr.microsoft.com/devcontainers/dotnet:6.0",
"forwardPorts": [5000, 5001],
"forwardPorts": [80],
"features": {
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
"version": "latest",
Expand All @@ -20,5 +20,6 @@
"GitHub.copilot"
]
}
}
},
"postCreateCommand": "docker-compose up -d"
}
9 changes: 6 additions & 3 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:
uses: catchpoint/[email protected]

create-qa-ticket:
needs: [ui-tests]
needs: [ui-tests, setup-staging-environment]
permissions:
actions: read
contents: read
Expand All @@ -132,6 +132,11 @@ jobs:
- name: Checkout code
uses: actions/[email protected]

- name: set CONTINER_APP_URL and HASH_URL in environment for the github-script action
run: |
echo CONTAINER_APP_URL="${{ needs.setup-staging-environment.outputs.CONTAINER_APP_URL }}" >> $GITHUB_ENV
echo HASH_URL="${{ needs.setup-staging-environment.outputs.HASH_URL }}" >> $GITHUB_ENV
- name: Create Issue
uses: actions/[email protected]
with:
Expand Down Expand Up @@ -164,8 +169,6 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
IMAGE_TAG: ${{ inputs.image_tag }}
CONTAINER_APP_URL: ${{ env.CONTAINER_APP_URL }}
HASH_URL: ${{ env.HASH_URL }}

production:
permissions:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ on:
- '.devcontainer/**'
- '.github/ISSUE_TEMPLATE/**'
- '.github/workflows/housekeeping*.yml'
- 'docker-compose.yml'

pull_request_target:
branches:
Expand All @@ -34,6 +35,7 @@ on:
- '.devcontainer/**'
- '.github/ISSUE_TEMPLATE/**'
- '.github/workflows/housekeeping*.yml'
- 'docker-compose.yml'

# defining global environment variables for all jobs
env:
Expand Down
15 changes: 14 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,20 @@ To run the Razor Pages Movie application locally using Docker Compose, follow th
docker compose up
```

This command will start both the SQL Server and the web application containers. <br>
This command will start both the SQL Server and the web application containers.

## 🚀 Running the app in GitHub Codespaces
To run the Razor Pages Movie application in GitHub Codespaces with the default .devcontainer setup, follow these steps:

Open the repository in GitHub Codespaces.
The .devcontainer setup will automatically start the application on startup on port 80.

## 🌐 Accessing the Application
The landing page will prompt you to login. By default, there are two main user logins for demonstration purposes:
- **Admin**: Username: `admin`, Password: `password`
- **User**: Username: `user`, Password: `password`

<br>
The web application will be accessible at: http://localhost

<details>
Expand Down

0 comments on commit a6f3d97

Please sign in to comment.