Skip to content

Commit 59ec754

Browse files
authored
Merge pull request #410 from stakater/fix-urls
fix urls
2 parents 650bc8e + 1b98768 commit 59ec754

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

.github/workflows/pull_request.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,22 @@ jobs:
3939
username: ${{ github.actor }}
4040
password: ${{ secrets.GHCR_TOKEN }}
4141

42-
- name: Run Docker container for the saap-docs app
42+
- name: Run Docker container for the kubestackplus-docs app
4343
run: |
44-
docker run -d --name saap-docs -p 8080:8080 ${{ env.IMAGE_PATH }}
44+
docker run -d --name kubestackplus-docs -p 8080:8080 ${{ env.IMAGE_PATH }}
4545
46-
- name: Wait for saap-docs app to be ready
46+
- name: Wait for kubestackplus-docs app to be ready
4747
run: |
4848
timeout 60 bash -c 'until curl -f http://localhost:8080/ > /dev/null 2>&1; do sleep 2; done'
4949
5050
- name: Run Playwright tests (Dockerized)
5151
run: |
5252
cd e2e
53-
docker build -t saap-docs-e2e-tests .
54-
docker run --rm --network host saap-docs-e2e-tests
53+
docker build -t kubestackplus-docs-e2e-tests .
54+
docker run --rm --network host kubestackplus-docs-e2e-tests
5555
5656
- name: Cleanup Docker container
5757
if: always()
5858
run: |
59-
docker stop saap-docs || true
60-
docker rm saap-docs || true
59+
docker stop kubestackplus-docs || true
60+
docker rm kubestackplus-docs || true

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ COPY --chown=1001:root . .
1313
RUN chmod +x prepare_theme.sh && ./prepare_theme.sh
1414
RUN mkdocs build
1515
FROM nginxinc/nginx-unprivileged:1.29-alpine AS deploy
16-
COPY --from=builder $HOME/application/site/ /usr/share/nginx/html/saap/
16+
COPY --from=builder $HOME/application/site/ /usr/share/nginx/html/kubestackplus/
1717
COPY default.conf /etc/nginx/conf.d/
1818

1919
# set non-root user
2020
USER 1001
2121

22-
LABEL name="Stakater App Agility Platform (SAAP) Documentation" \
22+
LABEL name="Stakater KubeStack+ Documentation" \
2323
maintainer="Stakater <hello@stakater.com>" \
2424
vendor="Stakater" \
2525
release="1" \
26-
summary="Documentation for SAAP"
26+
summary="Documentation for Stakater KubeStack+"
2727

2828
EXPOSE 8080:8080/tcp
2929

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Stakater App Agility Platform (SAAP) Documentation
1+
# Stakater KubeStack+ Documentation
22

3-
SAAP docs are built using [MkDocs](https://github.com/mkdocs/mkdocs) which is based on Python.
3+
KubeStack+ docs are built using [MkDocs](https://github.com/mkdocs/mkdocs) which is based on Python.
44

55
## GitHub Actions
66

@@ -34,7 +34,7 @@ Run test container:
3434
docker run -p 8080:8080 test
3535
```
3636

37-
Then access the docs on [`localhost:8080/saap`](localhost:8080/saap).
37+
Then access the docs on [`localhost:8080/kubestackplus`](localhost:8080/kubestackplus).
3838

3939
### Run commands locally
4040

default.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ server {
22
listen 8080;
33
root /usr/share/nginx/html/;
44
index index.html;
5-
error_page 403 404 /saap/404.html;
6-
location = /saap/404.html {
5+
error_page 403 404 /kubestackplus/404.html;
6+
location = /kubestackplus/404.html {
77
internal;
88
}
99
location / {
10-
try_files $uri $uri/ /saap/404.html;
10+
try_files $uri $uri/ /kubestackplus/404.html;
1111
}
1212
# redirects issued by nginx will be relative
1313
absolute_redirect off;

e2e/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "saap-docs-playwright-tests",
2+
"name": "kubestackplus-docs-playwright-tests",
33
"version": "1.0.0",
44
"license": "MIT",
55
"dependencies": {

e2e/src/run.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ async function openSearchIfVisible(page) {
2323
}
2424

2525
test('Verify index file exists', async ({ page }) => {
26-
await page.goto('/saap/index.html');
27-
await expect(page).toHaveURL(/\/saap\/index\.html$/);
26+
await page.goto('/kubestackplus/index.html');
27+
await expect(page).toHaveURL(/\/kubestackplus\/index\.html$/);
2828
});
2929

3030
test('Verify custom 404 file exists', async ({ page }) => {
31-
await page.goto('/saap/404.html');
32-
await expect(page).toHaveURL(/\/saap\/404\.html$/);
31+
await page.goto('/kubestackplus/404.html');
32+
await expect(page).toHaveURL(/\/kubestackplus\/404\.html$/);
3333
});
3434

3535
test('Search for incorrectly rendered fenced code blocks', async ({ page }) => {
36-
await page.goto('/saap/');
36+
await page.goto('/kubestackplus/');
3737
await page.waitForLoadState('domcontentloaded');
3838
await acceptConsentIfPresent(page);
3939
await openSearchIfVisible(page);
@@ -48,7 +48,7 @@ test('Search for incorrectly rendered fenced code blocks', async ({ page }) => {
4848
});
4949

5050
test('Search for incorrectly rendered admonitions', async ({ page }) => {
51-
await page.goto('/saap/');
51+
await page.goto('/kubestackplus/');
5252
await page.waitForLoadState('domcontentloaded');
5353
await acceptConsentIfPresent(page);
5454
await openSearchIfVisible(page);

0 commit comments

Comments
 (0)