Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
karl-johan-grahn committed Jan 29, 2024
2 parents 30eec41 + a27da7f commit 06818e6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 23 deletions.
14 changes: 3 additions & 11 deletions .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,17 @@ on:

jobs:
qa:
<<<<<<< Updated upstream
uses: stakater/.github/.github/workflows/[email protected]
=======
uses: stakater/.github/.github/workflows/[email protected]
>>>>>>> Stashed changes
with:
MD_CONFIG: .github/md_config.json
DOC_SRC: content
MD_LINT_CONFIG: .markdownlint.yaml
build:
<<<<<<< Updated upstream
uses: stakater/.github/.github/workflows/[email protected]
=======
uses: stakater/.github/.github/workflows/[email protected]
>>>>>>> Stashed changes
with:
DOCKER_FILE_PATH: Dockerfile
secrets:
CONTAINER_REGISTRY_URL: ${{ secrets.STAKATER_NEXUS_PREPROD_REGISTRY }}
CONTAINER_REGISTRY_USERNAME: ${{ secrets.STAKATER_NEXUS_PREPROD_USERNAME }}
CONTAINER_REGISTRY_PASSWORD: ${{ secrets.STAKATER_NEXUS_PREPROD_PASSWORD }}
CONTAINER_REGISTRY_URL: ghcr.io/stakater
CONTAINER_REGISTRY_USERNAME: stakater-user
CONTAINER_REGISTRY_PASSWORD: ${{ secrets.STAKATER_GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }}
10 changes: 3 additions & 7 deletions .github/workflows/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,13 @@ on:

jobs:
push:
<<<<<<< Updated upstream
uses: stakater/.github/.github/workflows/[email protected]
=======
uses: stakater/.github/.github/workflows/[email protected]
>>>>>>> Stashed changes
with:
DOCKER_FILE_PATH: Dockerfile
RELEASE_BRANCH: main
secrets:
CONTAINER_REGISTRY_URL: ${{ secrets.STAKATER_NEXUS_PREPROD_REGISTRY }}/stakater
CONTAINER_REGISTRY_USERNAME: ${{ secrets.STAKATER_NEXUS_PREPROD_USERNAME }}
CONTAINER_REGISTRY_PASSWORD: ${{ secrets.STAKATER_NEXUS_PREPROD_PASSWORD }}
CONTAINER_REGISTRY_URL: ghcr.io/stakater
CONTAINER_REGISTRY_USERNAME: stakater-user
CONTAINER_REGISTRY_PASSWORD: ${{ secrets.STAKATER_GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }}
GH_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
4 changes: 0 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ on:

jobs:
release:
<<<<<<< Updated upstream
uses: stakater/.github/.github/workflows/[email protected]
=======
uses: stakater/.github/.github/workflows/[email protected]
>>>>>>> Stashed changes
secrets:
SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11-alpine as builder
FROM python:3.12-alpine as builder

RUN pip3 install mkdocs-material mkdocs-mermaid2-plugin

Expand Down

0 comments on commit 06818e6

Please sign in to comment.