Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
rubenvdlinde committed Dec 10, 2019
2 parents fb63c2f + 4e1bffa commit 813e581
Show file tree
Hide file tree
Showing 7 changed files with 661 additions and 222 deletions.
10 changes: 5 additions & 5 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
##################################################

# The shortcode for this component, should be a small set of letters reprecentint the application
APP_NAME=pc
APP_NAME=vtc
# The Full title of the application
APP_TITLE=Proto Component
APP_TITLE=Verzoek Type Catalogus
# The current version of the application
APP_VERSION=V.0.1
# Do you want to display the symfony debug toolbar?
Expand Down Expand Up @@ -45,8 +45,8 @@ ORGANIZATION_UNIT_NAME=Common-Ground
##################################################

APP_DOMAIN=conduction.nl
APP_DEMO=pc.zaakonline.nl
APP_REPRO=https://github.com/ConductionNL/Proto-component-commonground
APP_DEMO=vtc.zaakonline.nl
APP_REPRO=https://github.com/ConductionNL/verzoektypecatalogus

##################################################
# Docker settings
Expand All @@ -55,7 +55,7 @@ APP_REPRO=https://github.com/ConductionNL/Proto-component-commonground
CONTAINER_REGISTRY_BASE=docker.io/conduction
CONTAINER_PROJECT_TITLE=Verzoek Type Catalogus
CONTAINER_PROJECT_NAME=vtc
CONTAINER_REPRO=https://hub.docker.com/repository/docker/conduction/pc-php
CONTAINER_REPRO=https://hub.docker.com/repository/docker/conduction/vtc-php

##################################################
# Notifcation settings
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/dockerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ jobs:
run: docker-compose logs
- name: Security Checks
run: docker-compose exec -T php composer req sensiolabs/security-checker
- name: Database Update
run: docker-compose exec -T php bin/console doctrine:schema:update --force
- name: Database Check
run: docker-compose exec -T php bin/console doctrine:schema:validate
- name: Chores
run: docker-compose down
- name: Login to DockerHub Registry
Expand Down
6 changes: 3 additions & 3 deletions api/helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
appVersion: 0.1.0
description: A Helm chart for an Common Ground VTC API component
name: verzoektypecatalogus
appVersion: V.0.1
description: ''Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar.''
name: pc
version: 0.1.0
home: https://common-ground.dev
icon: https://common-ground.dev/logo-250x250.png
18 changes: 13 additions & 5 deletions api/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,18 @@
settings:
registryBase: docker.io/conduction
projectName: vtc
version: dev
name: vtc
title: Verzoek Type Catalogus
version: V.0.1
description: ''Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar.''
repro: 'https://github.com/ConductionNL/Proto-component-commonground'
domain: conduction.nl
domain: conduction.nl
organisationName: Conduction
email: [email protected]
country: Netherlands
state: Noord-Holland
locality: Amsterdam
unit: Common-Ground
demo: pc.zaakonline.nl
env: dev
debug: 1
Expand All @@ -34,7 +42,7 @@ settings:


php:
repository: docker.io/conduction/protocomponent-php
repository: docker.io/conduction/vtc-php
tag: latest
mercure:
jwtSecret: ""
Expand All @@ -49,7 +57,7 @@ nginx:

varnish:
enabled: true
url: https://vtc-varnish
#url: https://example.com
repository: docker.io/conduction/vtc-varnish
tag: latest
pullPolicy: Always
Expand All @@ -73,7 +81,7 @@ postgresql:
# tag: alpine

mercure:
enabled: false
enabled: true
publishUrl: http://mercure/hub
subscribeUrl: https://mercure.example.com/hub
allowAnonymous: "1"
Expand Down
Loading

0 comments on commit 813e581

Please sign in to comment.