bes-r/teach
1
0
Fork 0
Code Issues Pull requests 5 Projects Releases Packages Wiki Activity Actions

Voeg thematische kleurplaten en creatieve niveaus toe (v0.4.65-beta) #3

Open
bes-r wants to merge 207 commits from bes-r/kleurplaten-v0-4-65 into main AGit
pull from: bes-r/kleurplaten-v0-4-65
merge into: bes-r:main
Conversation 0 Commits 207 Files changed 212 +18 -29
2 changed files with 18 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b7979dbbcf - Show all commits

24
.forgejo/workflows/dev.yaml
View file

@ -11,7 +11,7 @@ concurrency:
jobs: jobs:
build-and-deploy: build-and-deploy:
runs-on: self-hosted # label van jouw Forgejo-runner runs-on: dev # jouw dev-runner (test-server)
env: env:
# 10.0.20.22:3000 - host van je Forgejo (= container registry host) # 10.0.20.22:3000 - host van je Forgejo (= container registry host)
REGISTRY: ${{ vars.REGISTRY }} REGISTRY: ${{ vars.REGISTRY }}
@ -40,18 +40,12 @@ jobs:
docker push "${{ steps.meta.outputs.sha_tag }}" docker push "${{ steps.meta.outputs.sha_tag }}"
docker push "${{ steps.meta.outputs.dev_tag }}" docker push "${{ steps.meta.outputs.dev_tag }}"
# Deploy via gewone ssh (geen externe action nodig).
- name: Deploy naar test-VM - name: Deploy naar test-VM
uses: appleboy/ssh-action@v1 run: |
with: echo "${{ secrets.TEST_SSH_KEY }}" > deploy_key
host: ${{ secrets.TEST_HOST }} chmod 600 deploy_key
username: ${{ secrets.TEST_USER }} ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
key: ${{ secrets.TEST_SSH_KEY }} -i deploy_key ${{ secrets.TEST_USER }}@${{ secrets.TEST_HOST }} \
script: | "set -e && cd ${{ secrets.TEST_DEPLOY_PATH }} && echo '${{ secrets.REGISTRY_TOKEN }}' | docker login ${{ vars.REGISTRY }} -u '${{ secrets.REGISTRY_USER }}' --password-stdin && sed -i 's|^IMAGE=.*|IMAGE=${{ steps.meta.outputs.dev_tag }}|' .env && docker compose -f compose.deploy.yaml pull && docker compose -f compose.deploy.yaml up -d && docker image prune -f"
set -e rm -f deploy_key
cd ${{ secrets.TEST_DEPLOY_PATH }}
echo "${{ secrets.REGISTRY_TOKEN }}" | docker login ${{ vars.REGISTRY }} -u "${{ secrets.REGISTRY_USER }}" --password-stdin
# Zet de te draaien image-tag in de env van de VM
sed -i "s|^IMAGE=.*|IMAGE=${{ steps.meta.outputs.dev_tag }}|" .env
docker compose -f compose.deploy.yaml pull
docker compose -f compose.deploy.yaml up -d
docker image prune -f

23
.forgejo/workflows/release.yaml
View file

@ -12,7 +12,7 @@ concurrency:
jobs: jobs:
build-and-deploy: build-and-deploy:
runs-on: self-hosted # label van jouw Forgejo-runner runs-on: prod # jouw prod-runner (productieserver)
env: env:
REGISTRY: ${{ vars.REGISTRY }} REGISTRY: ${{ vars.REGISTRY }}
IMAGE_NAME: ${{ github.repository }} # bes-r/teach IMAGE_NAME: ${{ github.repository }} # bes-r/teach
@ -40,17 +40,12 @@ jobs:
docker push "${{ steps.meta.outputs.version_tag }}" docker push "${{ steps.meta.outputs.version_tag }}"
docker push "${{ steps.meta.outputs.latest_tag }}" docker push "${{ steps.meta.outputs.latest_tag }}"
# Deploy via gewone ssh (geen externe action nodig).
- name: Deploy naar productie-VM - name: Deploy naar productie-VM
uses: appleboy/ssh-action@v1 run: |
with: echo "${{ secrets.PROD_SSH_KEY }}" > deploy_key
host: ${{ secrets.PROD_HOST }} chmod 600 deploy_key
username: ${{ secrets.PROD_USER }} ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
key: ${{ secrets.PROD_SSH_KEY }} -i deploy_key ${{ secrets.PROD_USER }}@${{ secrets.PROD_HOST }} \
script: | "set -e && cd ${{ secrets.PROD_DEPLOY_PATH }} && echo '${{ secrets.REGISTRY_TOKEN }}' | docker login ${{ vars.REGISTRY }} -u '${{ secrets.REGISTRY_USER }}' --password-stdin && sed -i 's|^IMAGE=.*|IMAGE=${{ steps.meta.outputs.version_tag }}|' .env && docker compose -f compose.deploy.yaml pull && docker compose -f compose.deploy.yaml up -d && docker image prune -f"
set -e rm -f deploy_key
cd ${{ secrets.PROD_DEPLOY_PATH }}
echo "${{ secrets.REGISTRY_TOKEN }}" | docker login ${{ vars.REGISTRY }} -u "${{ secrets.REGISTRY_USER }}" --password-stdin
sed -i "s|^IMAGE=.*|IMAGE=${{ steps.meta.outputs.version_tag }}|" .env
docker compose -f compose.deploy.yaml pull
docker compose -f compose.deploy.yaml up -d
docker image prune -f