7f6ec2e409
Allow to disable require update password for default admin user ( #6780 )
...
* Fix FindTextFeatureTest selenium test (#6762 )
* Allow to disable require update password for default admin user
2017-10-17 23:48:15 +03:00
e321ab00b1
Merge with master
2017-10-15 14:33:47 +03:00
891b619a5f
fix dto versions that broke release, fix os scripts ( #6743 )
...
* Fix plugin version
2017-10-14 20:46:33 +03:00
03cb20ad64
Merge branch 'master' into che6
...
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
2017-10-14 17:00:09 +03:00
cee9715454
In `deploy_che.sh`, the keycloack route should be `https` when the che server is `https` ( #6739 )
...
In `deploy_che.sh`, the keycloack route should be `https` when the
che server is `https`
Signed-off-by: David Festal <dfestal@redhat.com>
2017-10-14 16:03:35 +03:00
1a12850c51
Merge remote-tracking branch 'origin/master' into che6
2017-10-13 09:20:16 +03:00
f03ed91b56
update kc image version ( #6712 )
...
* update kc image version
2017-10-12 22:09:14 +03:00
7a3e3a5e7b
Merge branch 'spi' of github.com:eclipse/che into spi
2017-10-11 10:17:03 +03:00
22c21265aa
Merge branch 'master' into spi
2017-10-11 10:16:43 +03:00
7e70804097
Fixed deploying of che on OCP ( #6656 )
...
* Add ability to set OAUTH token for che-server
* Add ability to configure OpenShift project where workspaces objects will be created for OCP and Minishift flavors
* Add ability to deploy che on ocp with local yaml file
* Add missed sed command for deploying with OCP flavor
* Replace null values with defaults
In some cases OpenShift API responses that config map is not valid.
Maybe it is because of version of APIs. It is a problem for OCP instance with openshift v3.5.5.31 and kubernetes v1.5.2+43a9be4
2017-10-11 09:27:11 +03:00
f7096c990e
che #6627 Fixing 'deploy_che.sh' after automerge
...
Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
2017-10-09 15:56:25 +02:00
03934a0804
Merge remote-tracking branch 'origin/master' into spi
...
# Conflicts:
# assembly-multiuser/assembly-wsmaster-war/pom.xml
# assembly-multiuser/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/MachineAuthModule.java
# assembly-multiuser/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/MultiUserCheWsMasterModule.java
# assembly-multiuser/assembly-wsmaster-war/src/main/resources/META-INF/persistence.xml
# assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/CheWsMasterModule.java
# assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
# dashboard/src/app/admin/user-management/user-details/user-details.html
# dashboard/src/app/organizations/organization-details/organization-details.html
# dashboard/src/app/teams/team-details/team-details.html
# dashboard/src/components/api/workspace/che-workspace.factory.ts
# dockerfiles/init/manifests/che.env
# dockerfiles/init/modules/openshift/files/scripts/deploy_che.sh
# dockerfiles/init/modules/openshift/files/scripts/multi-user/wait_until_postgres_is_available.sh
# ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/jsonrpc/WorkspaceMasterJsonRpcInitializer.java
# ide/che-core-ide-stacks/src/main/resources/stacks.json
# ide/che-core-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorPresenter.java
# multiuser/api/che-multiuser-api-resource/pom.xml
# multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/tracker/EnvironmentRamCalculator.java
# multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/tracker/RamResourceUsageTracker.java
# multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/workspace/LimitsCheckingWorkspaceManager.java
# multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/EnvironmentRamCalculatorTest.java
# multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/RamResourceUsageTrackerTest.java
# multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/workspace/LimitsCheckingWorkspaceManagerTest.java
# multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/workspace/TestObjects.java
# multiuser/integration-tests/che-multiuser-cascade-removal/pom.xml
# multiuser/integration-tests/che-multiuser-cascade-removal/src/test/java/org/eclipse/che/multiuser/integration/jpa/cascaderemoval/JpaEntitiesCascadeRemovalTest.java
# multiuser/integration-tests/che-multiuser-cascade-removal/src/test/java/org/eclipse/che/multiuser/integration/jpa/cascaderemoval/TestObjectsFactory.java
# multiuser/integration-tests/che-multiuser-cascade-removal/src/test/resources/META-INF/persistence.xml
# multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml
# multiuser/integration-tests/che-multiuser-postgresql-tck/src/test/java/MultiuserPostgresqlTckModule.java
# multiuser/integration-tests/che-multiuser-postgresql-tck/src/test/resources/META-INF/persistence.xml
# multiuser/keycloak/che-multiuser-keycloak-ide/src/main/java/org/eclipse/che/multiuser/keycloak/ide/KeycloakProvider.java
# multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml
# multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/java/org/eclipse/che/multiuser/machine/authentication/ide/MachineAsyncRequestFactory.java
# multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/java/org/eclipse/che/multiuser/machine/authentication/ide/MachineTokenServiceClientImpl.java
# multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/java/org/eclipse/che/multiuser/machine/authentication/ide/inject/MachineAuthGinModule.java
# multiuser/machine-auth/che-multiuser-machine-authentication/src/main/java/org/eclipse/che/multiuser/machine/authentication/server/MachineSessionInvalidator.java
# multiuser/permission/che-multiuser-permission-machine/pom.xml
# multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/filters/RecipePermissionsFilter.java
# multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/jpa/JpaRecipePermissionsDao.java
# multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/jpa/MultiuserJpaRecipeDao.java
# multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/jpa/MultiuserMachineJpaModule.java
# multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/jpa/listener/RemoveRecipeOnLastUserRemovedEventSubscriber.java
# multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/recipe/RecipeCreatorPermissionsProvider.java
# multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/recipe/RecipePermissionsImpl.java
# multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/filters/RecipePermissionsFilterTest.java
# multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/JpaRecipePermissionsDaoTest.java
# multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/JpaTestModule.java
# multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/MultiuserJpaRecipeDaoTest.java
# multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/RemovePermissionsBeforeRecipeRemovedEventSubscriberTest.java
# multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/TestWorkspaceEntity.java
# multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/recipe/RecipeCreatorPermissionsProviderTest.java
# multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/spi/tck/RecipePermissionsDaoTest.java
# multiuser/permission/che-multiuser-permission-workspace/pom.xml
# multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/WorkspaceCreatorPermissionsProvider.java
# multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilter.java
# multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/jpa/MultiuserWorkspaceJpaModule.java
# multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/spi/jpa/MultiuserJpaWorkspaceDao.java
# multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilterTest.java
# multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/jpa/WorkspaceTckModule.java
# multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/spi/jpa/JpaTckModule.java
# multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/spi/jpa/RemovePermissionsBeforeStackRemovedEventSubscriberTest.java
# multiuser/pom.xml
# plugins/plugin-docker/che-plugin-docker-machine/src/test/java/org/eclipse/che/plugin/docker/machine/MachineProviderImplTest.java
# plugins/plugin-docker/pom.xml
# plugins/plugin-github/che-plugin-github-pullrequest/src/main/java/org/eclipse/che/plugin/pullrequest/client/GitHubHostingService.java
# pom.xml
# selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/workspace/TestWorkspaceProviderImpl.java
# selenium/che-selenium-test/README.md
# selenium/che-selenium-test/pom.xml
# selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/CodenvyEditor.java
# selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/CreateWorkspaceOnDashboardTest.java
# selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/WorkingWithNodeWsTest.java
# selenium/che-selenium-test/src/test/resources/conf/selenium.properties
# wsagent/agent/src/main/java/org/eclipse/che/api/agent/WsAgentLauncher.java
# wsagent/agent/src/test/java/org/eclipse/che/api/agent/WsAgentLauncherTest.java
# wsmaster/che-core-api-user/pom.xml
# wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/environment/server/MachineLinksInjector.java
# wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceServiceLinksInjector.java
# wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/EnvironmentImpl.java
# wsmaster/integration-tests/postgresql-tck/pom.xml
2017-10-09 14:51:25 +03:00
3907fec73f
Remove opacity from hex formatted colors ( #6597 )
...
Remove opacity from hex formatted colors
2017-10-09 10:40:47 +03:00
ee01b2998f
Multi-user Eclipse Che ( #6441 )
...
Multi-user Eclipse Che (#6441 )
#### How to run it.
```docker run -it -e CHE_MULTIUSER=true -e CHE_HOST=<your ip> -e CHE_KEYCLOAK_AUTH-SERVER-URL=http://<your ip>:5050/auth -v /var/run/docker.sock:/var/run/docker.sock -v ~/.che-multiuser:/data eclipse/che:nightly start --skip:pull --skip:nightly```
#### How to manage it
- Keycloak configured with two realms. ```Master``` and ```che```. Also we have one user admin/admin in both realm. Admin user in master realm is - super admin.
- Eclipse Che configured for che realm
- We enabled user registration in ```Che``` realm
#### Known limitation
- swagger would not work. We need to upgrade a version. to support openid authentification https://github.com/eclipse/che/issues/6015
- It's working on local docker. We are going to provide scalable version based on OpenShift on next versions.
- Invitation of non-existent users to Eclipse Che organization https://github.com/eclipse/che/issues/6335
#### How to run it when it is in a branch
To run an multiuser Che version, the following steps are required after building the branch:
- Rebuild init, cli and che images (in the given sequence). To do that, proceed to folder _dockerfiles/<image_name>_ and run _build.sh_
- Run Che in a usual way using cli, with additional parameters: `-e CHE_MULTIUSER=true` and `--skip:pull --skip:nightly`
Full command example:
`docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock -v /home/user/.che:/data -e CHE_MULTIUSER=true eclipse/che-cli:nightly start --skip:pull --skip:nightly`
- MacOS users may need to edit _che.env_ file in the data folder, changing `CHE_HOST` and `CHE_KEYCLOAK_AUTH__SERVER__URL` values to their specific IP.
When start is succeeded, the following docker containers should be created:
- che, exposing 8080 port;
- che_keycloak, exposing 5050 port;
- che_postgres, exposing 5432 port;
2017-10-06 17:27:27 +03:00
4bc18519db
Merge branch 'che-multiuser' into spi
2017-10-05 16:30:22 +03:00
e002f1dc9e
Fix deploy che script ( #6581 )
2017-10-05 11:54:03 +03:00
f0558019af
make deploy script mac os friendly ( #6560 )
...
* make deploy script mac os friendly
2017-10-04 19:57:43 +03:00
0d8d93377f
merge with master
2017-10-04 15:16:15 +03:00
ed734bbaec
synchronize deploy scripts ( #6566 )
2017-10-04 12:06:34 +03:00
8de6dbe5fb
Merge branch 'che-multiuser' into spi
2017-10-03 13:04:39 +03:00
226bfd4c85
CHE-6226: Che stylization of Keycloak account pages ( #6501 )
...
CHE-6226: Che stylization of Keycloak account pages
2017-10-03 10:23:27 +03:00
49f80dad17
CHE-5893: Map system state API to login filter
...
It is needed since it is secured by permissions system which requires
an authenticated user.
Also, use base API endpoint for checking Che in OpenShift deploy
script since system state API which was used before is secured now.
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
2017-10-03 09:45:58 +03:00
87c3478221
Upgrade PostgreSQL image version to postgresql-96-centos7 ( #6528 )
...
Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
2017-10-03 08:42:39 +03:00
81bce959ce
Merge branch 'che-multiuser' into spi
2017-10-02 14:59:55 +03:00
e7ae7334e7
Fixing script with support of deploying spi to prod cluster
...
Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
2017-10-02 09:13:06 +02:00
1161181899
Deploy multi-user Che to openshift ( #6195 )
...
* Allow deploying the Keycloak and Postgres servers to Minishift and Openshift Online.
This is related to https://github.com/redhat-developer/rh-che/issues/303
and https://github.com/redhat-developer/rh-che/issues/302
* Make the Che directory readble for any users
* Modify `deploy_che.sh` to support `multi-user` images
* Move the scripts to `che-init` and enhance `deploy-che.sh` to start the secondary server if necessary and wait for postgres to be available.
* Wait for Postgres to be available before starting Keycloak
* Clean scripts through spellcheck and add missing licenses
* Change the health check to `/api` instead of `/api/system/state` since, with the new permission work, accessing `/api/system/*` requires the user to have specific system rights.
* Fixes after comments on PR
* Use the new official `keycloak-openshift` image and manage web-origins
* Make Keycloak memory limits consistent with official requirements defined
[here](http://www.keycloak.org/docs/latest/server_installation/topics/installation/system-requirements.html )
Signed-off-by: David Festal <dfestal@redhat.com>
2017-09-29 16:07:36 +02:00
108b3d832b
Merge remote-tracking branch 'origin/che-multiuser' into spi-multiuser
...
# Conflicts:
# assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
# dockerfiles/init/manifests/che.env
# plugins/plugin-docker/che-plugin-docker-machine/src/test/java/org/eclipse/che/plugin/docker/machine/MachineProviderImplTest.java
# plugins/plugin-docker/pom.xml
# plugins/plugin-github/che-plugin-github-pullrequest/src/main/java/org/eclipse/che/plugin/pullrequest/client/GitHubHostingService.java
# pom.xml
# wsagent/agent/src/main/java/org/eclipse/che/api/agent/WsAgentLauncher.java
# wsagent/agent/src/test/java/org/eclipse/che/api/agent/WsAgentLauncherTest.java
# wsmaster/che-core-api-machine/pom.xml
# wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/EnvironmentImpl.java
2017-09-28 12:33:07 +03:00
28c5193252
Merge commit 'da636d181c41a5602dbd5ced28474ad985df49c0' into spi
2017-09-28 12:15:59 +03:00
679df96208
CHE-6265: Add Keycloak email templates ( #6451 )
...
CHE-6265: Add Keycloak email templates
2017-09-28 11:56:41 +03:00
01ab2b2587
Merge remote-tracking branch 'origin/master' into che-multiuser
...
# Conflicts:
# dashboard/src/app/index.module.ts
# dashboard/src/app/workspaces/workspace-details/workspace-details.service.ts
# dashboard/src/components/typings/che.d.ts
2017-09-27 13:36:26 +03:00
3f6c295c47
Moving openshift template for spi in the 'init/openshift/module'
...
Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
2017-09-27 12:34:45 +02:00
79ac0e78b8
Fix the stack json link
2017-09-27 12:07:40 +02:00
de52d5f04b
Code cleanup
2017-09-27 11:29:54 +03:00
a99e4d13c6
Merge branch 'master' into spi
2017-09-27 09:35:39 +03:00
f08f5c52fc
Merge with master
2017-09-26 15:33:44 +03:00
5725219d11
Move the Openshift scripts from the cli image to the init image... ( #6390 )
...
... so that they are available locally after a `docker run cli:config`.
Signed-off-by: David Festal <dfestal@redhat.com>
2017-09-26 10:34:19 +02:00
d052e6cb68
set sslRequired to none by default
2017-09-25 15:48:14 +03:00
e7006e5ae4
Merge with master
2017-09-18 08:46:28 +03:00
1174e9ca34
Setup Traefik restart always.
...
Signed-off-by: Masaki Muranaka <monaka@monami-ya.com>
2017-09-13 11:23:40 +02:00
202ded08ec
Merge branch 'master' into che-multiuser
2017-08-18 10:33:46 +03:00
ce41b4a71d
Change copyright owner to "Red Hat, Inc" on remaining files ( #6032 )
...
* Change copyright owner on remaining files
* fixup! Change copyright owner on remaining files
* fixup! fixup! Change copyright owner on remaining files
2017-08-17 18:05:53 +03:00
c87d869caf
Added ability to configure ds with environment variables
2017-08-15 17:34:40 +03:00
c8b92fcc74
Merge with master
2017-08-11 16:42:29 +03:00
69d5148385
Changed copyright owner to "Red Hat, Inc." in license headers ( #5964 )
...
Change license header contributor to Red Hat, Inc.
2017-08-11 10:46:58 +03:00
9482b9db12
Che Keycloak theme: Set font to Roboto. Align popup text to the left. ( #5951 )
2017-08-10 08:56:00 +03:00
78f7bf82b5
Allow all web origins for public realm to dial with Cors problems
2017-08-04 15:04:59 +03:00
b53ec65286
get rid of hardcoded paths in che-server container ( #5880 )
...
* get rid of hardcoded paths in container
2017-08-03 13:09:01 +03:00
ebd0019459
Che theme for Keycloak ( #5859 )
...
Add draft of Che theme for keycloak
2017-08-02 15:23:31 +03:00
e270461059
add possibility to configure postgres connection
2017-08-01 15:56:51 +03:00
f88ff1cbb5
fix compose
2017-08-01 15:24:07 +03:00
Roman Iuvshyn