Skip to content

Commit 75ef788

Browse files
committed
Update to 8.3
1 parent 1c72ea5 commit 75ef788

6 files changed

Lines changed: 24 additions & 14 deletions

File tree

.env

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ TUTORIAL_APP_PORT=3000
1919
TUTORIAL_DUMMY_DEVICE_PORT=3001
2020

2121
# Keyrock variables
22-
KEYROCK_VERSION=8.1.0-distroless
22+
KEYROCK_VERSION=8.3.0-distroless
2323
KEYROCK_PORT=3005
2424
KEYROCK_HTTPS_PORT=3443
2525

2626
# MySQL variables
27-
MYSQL_DB_VERSION=5.7
27+
MYSQL_DB_VERSION=8.0
2828
MYSQL_DB_PORT=3306
2929

3030
# PEP Proxy variables
31-
WILMA_VERSION=8.1.0-distroless
31+
WILMA_VERSION=8.3.0-distroless
3232
ORION_PROXY_PORT=1027

.gitpod.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
tasks:
2+
- name: Pull Images
3+
init: ./services create
4+
15
ports:
26
- name: Orion
37
description: Context Broker

docker-compose/northport.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ services:
108108
- IDM_ADMIN_USER=alice
109109
- IDM_ADMIN_EMAIL=alice-the-admin@test.com
110110
- IDM_ADMIN_PASS=test
111+
- IDM_CSP_FORM_ACTION=*
111112
secrets:
112113
- my_secret_data
113114
healthcheck:

docker-compose/orion.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ services:
7777
labels:
7878
org.fiware: 'tutorial'
7979
image: fiware/idm:${KEYROCK_VERSION}
80-
#image: keyrock-slim
8180
container_name: fiware-keyrock
8281
hostname: keyrock
8382
networks:
@@ -99,6 +98,7 @@ services:
9998
- IDM_ADMIN_USER=alice
10099
- IDM_ADMIN_EMAIL=alice-the-admin@test.com
101100
- IDM_ADMIN_PASS=test
101+
- IDM_CSP_FORM_ACTION=*
102102
secrets:
103103
- my_secret_data
104104
healthcheck:

docker-compose/southport.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ services:
9797
- IDM_ADMIN_USER=alice
9898
- IDM_ADMIN_EMAIL=alice-the-admin@test.com
9999
- IDM_ADMIN_PASS=test
100+
- IDM_CSP_FORM_ACTION=*
100101
secrets:
101102
- my_secret_data
102103
healthcheck:
@@ -259,6 +260,7 @@ services:
259260
labels:
260261
org.fiware: 'tutorial'
261262
image: mysql:${MYSQL_DB_VERSION}
263+
platform: linux/amd64
262264
hostname: mysql-db
263265
container_name: db-mysql
264266
expose:

mysql-data/backup.sql

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,9 @@ CREATE TABLE `permission` (
466466
`is_regex` tinyint(1) NOT NULL DEFAULT '0',
467467
`authorization_service_header` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
468468
`use_authorization_service_header` tinyint(1) NOT NULL DEFAULT '0',
469+
`regex_entity_ids` varchar(255) DEFAULT NULL,
470+
`regex_attributes` varchar(255) DEFAULT NULL,
471+
`regex_types` varchar(255) DEFAULT NULL,
469472
PRIMARY KEY (`id`),
470473
KEY `oauth_client_id` (`oauth_client_id`),
471474
CONSTRAINT `permission_ibfk_1` FOREIGN KEY (`oauth_client_id`) REFERENCES `oauth_client` (`id`) ON DELETE CASCADE
@@ -479,16 +482,16 @@ CREATE TABLE `permission` (
479482
LOCK TABLES `permission` WRITE;
480483
/*!40000 ALTER TABLE `permission` DISABLE KEYS */;
481484
INSERT INTO `permission` VALUES
482-
('1','Get and assign all internal application roles',NULL,1,NULL,NULL,NULL,'idm_admin_app',0,NULL,0),
483-
('2','Manage the application',NULL,1,NULL,NULL,NULL,'idm_admin_app',0,NULL,0),
484-
('3','Manage roles',NULL,1,NULL,NULL,NULL,'idm_admin_app',0,NULL,0),
485-
('4','Manage authorizations',NULL,1,NULL,NULL,NULL,'idm_admin_app',0,NULL,0),
486-
('5','Get and assign all public application roles',NULL,1,NULL,NULL,NULL,'idm_admin_app',0,NULL,0),
487-
('6','Get and assign only public owned roles',NULL,1,NULL,NULL,NULL,'idm_admin_app',0,NULL,0),
488-
('increase-stck-0000-0000-000000000000','Order Stock','Increase Stock Count',0,'GET','/app/order-stock',NULL,'tutorial-dckr-site-0000-xpresswebapp',0,NULL,0),
489-
('entrance-open-0000-0000-000000000000','Unlock','Unlock main entrance',0,'POST','/door/unlock',NULL,'tutorial-dckr-site-0000-xpresswebapp',0,NULL,0),
490-
('alrmbell-ring-0000-0000-000000000000','Ring Alarm Bell',NULL,0,'POST','/bell/ring',NULL,'tutorial-dckr-site-0000-xpresswebapp',0,NULL,0),
491-
('pricechg-stck-0000-0000-000000000000','Access Price Changes',NULL,0,'GET','/app/price-change',NULL,'tutorial-dckr-site-0000-xpresswebapp',0,NULL,0);
485+
('1','Get and assign all internal application roles',NULL,1,NULL,NULL,NULL,'idm_admin_app',0,NULL,0,NULL,NULL,NULL),
486+
('2','Manage the application',NULL,1,NULL,NULL,NULL,'idm_admin_app',0,NULL,0,NULL,NULL,NULL),
487+
('3','Manage roles',NULL,1,NULL,NULL,NULL,'idm_admin_app',0,NULL,0,NULL,NULL,NULL),
488+
('4','Manage authorizations',NULL,1,NULL,NULL,NULL,'idm_admin_app',0,NULL,0,NULL,NULL,NULL),
489+
('5','Get and assign all public application roles',NULL,1,NULL,NULL,NULL,'idm_admin_app',0,NULL,0,NULL,NULL,NULL),
490+
('6','Get and assign only public owned roles',NULL,1,NULL,NULL,NULL,'idm_admin_app',0,NULL,0,NULL,NULL,NULL),
491+
('increase-stck-0000-0000-000000000000','Order Stock','Increase Stock Count',0,'GET','/app/order-stock',NULL,'tutorial-dckr-site-0000-xpresswebapp',0,NULL,0,NULL,NULL,NULL),
492+
('entrance-open-0000-0000-000000000000','Unlock','Unlock main entrance',0,'POST','/door/unlock',NULL,'tutorial-dckr-site-0000-xpresswebapp',0,NULL,0,NULL,NULL,NULL),
493+
('alrmbell-ring-0000-0000-000000000000','Ring Alarm Bell',NULL,0,'POST','/bell/ring',NULL,'tutorial-dckr-site-0000-xpresswebapp',0,NULL,0,NULL,NULL,NULL),
494+
('pricechg-stck-0000-0000-000000000000','Access Price Changes',NULL,0,'GET','/app/price-change',NULL,'tutorial-dckr-site-0000-xpresswebapp',0,NULL,0,NULL,NULL,NULL);
492495
/*!40000 ALTER TABLE `permission` ENABLE KEYS */;
493496
UNLOCK TABLES;
494497

0 commit comments

Comments
 (0)