Skip to content

Commit

Permalink
Merge pull request #71 from ConductionNL/dev-robert3
Browse files Browse the repository at this point in the history
MySQL version update to 5.7
  • Loading branch information
rubenvdlinde authored Jan 13, 2020
2 parents 896d8da + ee0588f commit f9f1832
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ CONTAINER_REPRO=https://hub.docker.com/repository/docker/conduction/pc-php
##################################################

NOTIFICATION_ENABLED=falsedxfddxf
NOTIFICATION_PROVIDER=sasdasd
NOTIFICATION_PROVIDER=sasdasdasd
NOTIFICATION_ENABLED_AUTHORIZATION=sasd

##################################################
Expand Down
2 changes: 1 addition & 1 deletion api/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ settings:
debug: 1
replicaCount: 1
corsAllowOrigin: ['*']
trustedHosts: '^(.+\.)?conduction\.nl$|^(.+\.)?vng\.cloud$|^(.+\.)?huwelijksplanner\.online$|^(.+\.)?larping\.eu$|^(.+\.)?common-ground\.dev$|^(.+\.)?trouwplanner\.online$|^(.+\.)?zaakonline\.nl$|localhost'
trustedHosts: '^(.+\.)?conduction\.nl$|^(.+\.)?huwelijksplanner\.online$|^(.+\.)?larping\.eu$|^(.+\.)?common-ground\.dev$|^(.+\.)?trouwplanner\.online$|^(.+\.)?zaakonline\.nl$|localhost'
pullPolicy: Always
# You will need these proxies on kubernetes
trustedProxies:
Expand Down
2 changes: 1 addition & 1 deletion api/public/schema/publiccode.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ url: "https://github.com/ConductionNL/Proto-component-commonground"
landingURL: "pc.zaakonline.nl"
isBasedOn: "https://github.com/ConductionNL/Proto-component-commonground.git"
softwareVersion: "V.0.1"
releaseDate: "2020-01-01"
releaseDate: "2020-06-01"
logo: pc.zaakonline.nl
monochromeLogo: img/logo-mono.svg

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ services:
# - db-data:/var/lib/postgresql/data:rw

db:
image: mysql:5.6
image: mysql:5.7
restart: always
environment:
- MYSQL_ROOT_PASSWORD=example
Expand Down

0 comments on commit f9f1832

Please sign in to comment.