Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/development' into Theme-test-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
remko48 committed Nov 27, 2023
2 parents bb5cb36 + b5a425c commit feb3eeb
Show file tree
Hide file tree
Showing 82 changed files with 24,904 additions and 553 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ APP_TYPE=component
# The urls/ip's and hosts on wich this api is available

TRUSTED_PROXIES=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
TRUSTED_HOSTS=^.+$
TRUSTED_HOSTS=

# Key that other applications can use to connect to this application (hier mag wel iets meer toelichtende tekst bij)

Expand Down Expand Up @@ -124,7 +124,7 @@ APP_REPRO=https://github.com/ConductionNL/skeleton-app

CONTAINER_REGISTRY_BASE=ghcr.io/conductionnl
HELM_REPOSITORY=https://raw.githubusercontent.com/ConductionNL/skeleton-app/master/api/helm/
CONTAINER_PROJECT_NAME=skeleton-app
CONTAINER_PROJECT_NAME=woo-website
##################################################

# Notifcation settings
Expand Down
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Bugmelding
description: Meld een probleem of fout
title: "[Bug]: "
labels: [bug]
body:
- type: textarea
id: bug-description
attributes:
label: Beschrijving van de bug
placeholder: "Beschrijf wat er gebeurde toen de bug optrad."
validations:
required: true
- type: textarea
id: reproduce-steps
attributes:
label: Stappen om te reproduceren
placeholder: "Beschrijf de stappen die nodig zijn om de bug opnieuw te laten optreden."
validations:
required: true
99 changes: 99 additions & 0 deletions .github/workflows/dockerimage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
name: Docker Image CI

on:
pull_request:
branches:
- main
- development
push:
branches:
- main
- development

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
- name: Export release code
if: (success() || failure())
id: releasecode #version number in a more comprehensible format: 0.1.YearMonthDay in UTC
run: |
export VERSION=$(grep APP_VERSION= .env | cut -d '=' -f2)
export RELEASE=$VERSION.$(date --utc +%y%m%d)
echo "RELEASE=$RELEASE" >> $GITHUB_ENV
echo "##[set-output name=releasename]$RELEASE"
- name: Setting APP_NAME
run: |
export NAME=$(grep APP_NAME= .env | cut -d '=' -f2)
echo "APP_NAME=$NAME" >> $GITHUB_ENV
- name: Print app name
run: echo "APP_NAME = $APP_NAME"
- name: Setting APP_ENV to dev
run: |
echo "APP_ENV=dev">> $GITHUB_ENV
echo "APP_BUILD=dev">> $GITHUB_ENV
echo "set APP_ENV to $APP_ENV"
- name: Setting APP_ENV to prod
if: contains( github.ref, 'main' ) || contains( github.base_ref, 'main' )
run: |
echo "APP_ENV=latest">> $GITHUB_ENV
echo "APP_BUILD=latest">> $GITHUB_ENV
echo "set APP_ENV to $APP_ENV"
- name: Print definitive APP_ENV
run: echo "APP_ENV is now $APP_ENV and APP_BUILD is now $APP_BUILD"
- name: Build the Docker image
run: docker-compose build --build-arg APP_ENV=$APP_ENV --build-arg APP_BUILD=$APP_BUILD --build-arg APP_BUILD_ALL_FIXTURES=true
- name: Run the docker image
run: docker-compose up -d
- name: Taking some sleep (for containers to come up)
run: sleep 20
- name: Check if all containers are running
run: docker ps
- name: Dumping the logs
run: docker-compose logs
- name: Show all images
run: docker images
- name: Login to Container Registry
id: containerregistry-login
run: |
if [ "${{ secrets.GITHUB_TOKEN }}" != "" ]; then
echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $(cut -d'/' -f1 <<< $GITHUB_REPOSITORY) --password-stdin
echo "##[set-output name=success;]true"
else
echo "##[set-output name=success;]false"
fi
- if: steps.containerregistry-login.outputs.success == 'true' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/development')
name: Push to Container Registry
run: docker-compose push

- if: steps.containerregistry-login.outputs.success == 'true' && github.ref == 'refs/heads/main'
name: Push versioned containers to Container Registry
id: version-push
run: |
images=$(docker-compose images -q | xargs docker inspect --format='{{ index .RepoTags 0}}' | cut -d':' -f1 | grep $APP_NAME)
for image in $images
do
docker push "${image}":"${APP_BUILD}"
done
- name: Print release name
if: (success() || failure())
run: echo $RELEASENAME
env:
RELEASENAME: ${{ steps.releasecode.outputs.releasename }}
- name: Create Release
if: contains( github.ref, 'main' ) && steps.version-push.outputs.success == 'true' && ( success() || failure() )
id: create_release
uses: actions/create-release@v1
continue-on-error: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
with:
tag_name: ${{ steps.releasecode.outputs.releasename }}
release_name: ${{ steps.releasecode.outputs.releasename }}
draft: false
prerelease: false
- name: Chores
if: (success() || failure())
run: docker-compose down
107 changes: 22 additions & 85 deletions .github/workflows/product-page-deploy.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .github/workflows/woo-page-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy the Product Page to GitHub Pages
name: Deploy the WOO Page to GitHub Pages

env: # Change these to your preferences any image url can also be a base encoded image
GITHUB_PAGES_BRANCH: gh-pages
Expand Down
7 changes: 7 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Licentie EUPL 1.2

De OpenWoo.app is een project dat gelicentieerd is onder de Europese Unie Public Licence (EUPL). De EUPL is een open-source licentie die is goedgekeurd door de Europese Commissie. Deze licentie biedt een sterke juridische basis om ervoor te zorgen dat de software vrij en open blijft, en is ontworpen om compatibel te zijn met andere licenties zoals de GNU General Public License (GPL).

Door het gebruik van de EUPL, geeft OpenWoo.app aan dat het project gecommitteerd is aan het behouden van een open en collaboratieve omgeving. Gebruikers en ontwikkelaars hebben de vrijheid om de software te gebruiken, te wijzigen, en te delen, zolang zij zich houden aan de voorwaarden die in de licentie zijn gesteld. Dit omvat, maar is niet beperkt tot, het behoud van de licentie-informatie en de auteursrechtkennisgevingen wanneer de software wordt gedistribueerd, of wanneer afgeleide werken worden gecreëerd.

De EUPL-licentie ondersteunt de juridische en operationele grondslagen van open-source projecten, en draagt bij aan het algemene doel van het bevorderen van softwarevrijheid en samenwerking in de gemeenschap.
Loading

0 comments on commit feb3eeb

Please sign in to comment.