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
9e59506125
fix unbound variable in cli tests ( #6431 )
2017-09-26 12:05:04 +03:00
839944884f
Allow overriding the images used by the CLI ( #6379 )
...
* Allow overriding the used images (IMAGE_INIT, ...) when using the CLI
Signed-off-by: David Festal <dfestal@redhat.com>
* fix bad formatting
Signed-off-by: David Festal <dfestal@redhat.com>
* clean in www.shellcheck.net
Signed-off-by: David Festal <dfestal@redhat.com>
* Add tests
Signed-off-by: David Festal <dfestal@redhat.com>
* Fix a mistake
Signed-off-by: David Festal <dfestal@redhat.com>
2017-09-26 10:35:00 +02: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
d7d98081ea
Added components to initialize admin permissions for configured user ( #6414 )
...
* Init admin permissions
2017-09-25 14:52:08 +03:00
ac922fb902
fix CLI build scrip, add nightly missing images file
2017-09-25 14:40:03 +03:00
4ed3c42e96
Add multiuser environment variables
2017-09-22 15:22:33 +03:00
524d6038ae
Changing image pull policy to in template that is used for spi deployment on minishift
...
Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
2017-09-22 10:31:18 +02:00
af4d967aa0
Merge remote-tracking branch 'origin/master' into che-multiuser
2017-09-22 11:14:36 +03:00
0ca969012b
Mailsender ( #6374 )
...
Mailsender
2017-09-22 10:34:26 +03:00
a092d9792f
fix docker images build ( #6372 )
...
* fix docker images build
2017-09-21 12:09:45 +03:00
66d6f9476a
fix docker images build ( #6372 )
...
* fix docker images build
2017-09-21 11:13:26 +03:00
685def4d29
Merge branch 'master' into spi
2017-09-21 09:24:39 +03:00
91dafee676
CHE-6317: rework script to deploy Che to OS ( #6347 )
...
Rework script that deploys Che to OpenShift in accordance with changes
in the SPI branch.
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
2017-09-20 16:16:40 +03:00
6fe743e321
interrupt build scripts for Dockerfiles on failure ( #6363 )
2017-09-20 16:02:54 +03:00
546ba4e4ea
Merge with master
2017-09-20 11:34:18 +03:00
d668c95da2
fix che-lib build.sh if condition ( #6350 )
2017-09-19 20:52:45 +03:00
8e03d56bfb
RELEASE: Set next development version ( #6345 )
2017-09-19 14:52:53 +03:00
942254eacf
Adding support of applying limitranges / resourcequotas on minishift
...
Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
2017-09-19 11:30:22 +02:00
e7006e5ae4
Merge with master
2017-09-18 08:46:28 +03:00
acce13f30c
Merge branch 'master' into spi
2017-09-15 11:21:33 +03:00
9e5193c586
Apply chmod to folders only to fool COW
...
Signed-off-by: Mario Loriedo <mloriedo@redhat.com>
2017-09-14 17:33:42 +02:00
2fc527916e
Rework infrastructure endpoints configuration
2017-09-14 17:20:40 +03:00
a07ffc3c70
Merge branch 'master' into spi
2017-09-14 15:48:40 +03:00
1174e9ca34
Setup Traefik restart always.
...
Signed-off-by: Masaki Muranaka <monaka@monami-ya.com>
2017-09-13 11:23:40 +02:00
dd5a166696
Property fix
2017-09-12 15:21:10 +03:00
d635b25831
Adds permissions into Che multiuser. ( #6133 )
2017-09-12 11:43:04 +03:00
9866284b67
Merge branch 'master' into spi
2017-09-12 11:36:21 +03:00
bc98043240
Merge with master
2017-09-12 09:45:20 +03:00
adadce9a97
Backport rh-che changes to openshift deployment script
...
Signed-off-by: Mario Loriedo <mloriedo@redhat.com>
2017-09-11 11:14:19 +02:00
715a98f17b
Modify che-server Dockerfile to run on OpenShift ( #6200 )
...
Signed-off-by: Mario Loriedo <mloriedo@redhat.com>
2017-09-11 11:00:16 +02:00
3b78c21bbf
Merge branch 'master' into spi
2017-09-07 12:25:37 +03:00
87d7b59047
Fix some incorrect environment variables
...
Signed-off-by: David Festal <dfestal@redhat.com>
2017-09-06 19:31:52 +02:00
d3f58dd1d7
Merge branch 'master' into che-multiuser
2017-09-06 10:03:18 +03:00
17ae2e6894
fix cli config test ( #6137 )
...
Signed-off-by: Roman Iuvshyn <riuvshyn@redhat.com>
2017-09-05 12:13:59 +03:00
05f5921aad
CLI tests, exit if any test failed to prevent pushing images ( #6131 )
...
Signed-off-by: Roman Iuvshyn <riuvshyn@redhat.com>
2017-09-05 10:34:14 +03:00
b2a6d260fc
Merge branch 'che-multiuser' of github.com:eclipse/che into che-multiuser
2017-09-04 13:05:44 +03:00
d717b35f9d
fix CLI tests
2017-09-04 13:05:32 +03:00
04be689c69
Merge branch 'master' into spi
2017-09-04 11:51:57 +03:00
2b682528de
Merge branch 'master' into che-multiuser
2017-09-04 10:50:27 +03:00
4564c1a064
Scripts to deploy Che on OpenShift ( #6098 )
...
Signed-off-by: Mario Loriedo <mloriedo@redhat.com>
2017-08-31 10:04:38 +02:00
Sergii Leshchenko