Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
5 changes: 5 additions & 0 deletions .github/scripts/staging/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Staging Test Environment

This is an HTTP staging area - to test interactions between orionrobots code, htaccess files, and Apache. The conf files intend to reflect a hosting company's settings.

This staging environment is used by the GitHub Actions workflows to test the built site before deployment.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/on_call_build_site.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ jobs:
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: httpd.conf
path: _drafts/staging/httpd.conf
path: .github/scripts/staging/httpd.conf
if-no-files-found: error
4 changes: 2 additions & 2 deletions .github/workflows/on_call_staging_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
tar -xzf _site.tar.gz
- name: Prepare for docker build
run: |
cp _drafts/staging/Dockerfile _site/
cp _drafts/staging/http2.conf _site/
cp .github/scripts/staging/Dockerfile _site/
cp .github/scripts/staging/http2.conf _site/

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_push_to_master_test_and_deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
with:
name: httpd.conf
path: _drafts/staging/httpd.conf
path: .github/scripts/staging/httpd.conf

# Sync the files
- name: Sync the site over
Expand Down
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,13 @@ Attaching to orionrobotsgithubio-web-1
orionrobotsgithubio-web-1 | ruby 3.1.1p18 (2022-02-18 revision 53f5fc4236) [x86_64-linux-musl]
```

## Staging Test Environment

The staging test environment is located in `.github/scripts/staging/` and contains Docker configuration files used for testing the built site before deployment. This environment:

- Tests the site with Apache configuration that mirrors the hosting environment
- Validates that htaccess rules work correctly
- Ensures the site serves properly before deployment

The staging tests run automatically in CI/CD workflows when changes are pushed to the master branch or in pull requests.

3 changes: 0 additions & 3 deletions _drafts/staging/README.md

This file was deleted.

2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ services:
target: httpd_serve
volumes:
- ./_site:/usr/local/apache2/htdocs/
- ./_drafts/staging/http2.conf:/etc/nginx/conf.d/http2.conf
- ./.github/scripts/staging/http2.conf:/usr/local/apache2/conf/http2.conf
- ./htaccess:/usr/local/apache2/htdocs/.htaccess
ports:
- 8082:80
Expand Down
2 changes: 1 addition & 1 deletion serve.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ FROM dcycle/broken-link-checker:3 AS broken_link_checker
FROM httpd:2.4.64 AS httpd_serve

# COPY _site /var/www/html/
COPY _drafts/staging/http2.conf /etc/httpd/conf/httpd.conf
COPY .github/scripts/staging/http2.conf /etc/httpd/conf/httpd.conf

FROM base