From aa224692ad82bef22d5484602c9ecf17bf1c19bc Mon Sep 17 00:00:00 2001 From: Yevhen Vydolob Date: Fri, 8 Feb 2019 10:31:21 +0200 Subject: [PATCH 1/6] #39 fix extension branch Signed-off-by: Yevhen Vydolob --- build_and_push_docker_images.sh | 2 +- extensions/extensions.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build_and_push_docker_images.sh b/build_and_push_docker_images.sh index c69189ceb..2abe64600 100755 --- a/build_and_push_docker_images.sh +++ b/build_and_push_docker_images.sh @@ -29,7 +29,7 @@ eclipse/che-theia-master for image_dir in "${DOCKER_FILES_LOCATIONS[@]}" do if [ "$image_dir" == "dockerfiles/theia" ]; then - THEIA_IMAGE_TAG="$(awk '/ARG THEIA_VERSION=/{print $NF}' dockerfiles/theia/Dockerfile | cut -d '=' -f2)-nightly" + THEIA_IMAGE_TAG="nightly" bash $(pwd)/$image_dir/build.sh --build-args:GITHUB_TOKEN=${GITHUB_TOKEN},THEIA_VERSION=master --branch:master --git-ref:refs\\/heads\\/master elif [ "$image_dir" == "dockerfiles/theia-dev" ]; then bash $(pwd)/$image_dir/build.sh --build-arg:GITHUB_TOKEN=${GITHUB_TOKEN} diff --git a/extensions/extensions.yml b/extensions/extensions.yml index 04761a918..c48be359c 100644 --- a/extensions/extensions.yml +++ b/extensions/extensions.yml @@ -19,4 +19,4 @@ extensions: - extensions/eclipse-che-theia-plugin-ext - extensions/eclipse-che-theia-terminal - extensions/eclipse-che-theia-remote - checkoutTo: 0.0.4 + checkoutTo: master From e32895845be4d602fa92ee03d9dcb59003232240 Mon Sep 17 00:00:00 2001 From: Yevhen Vydolob Date: Fri, 8 Feb 2019 10:32:58 +0200 Subject: [PATCH 2/6] #39 set extensions to stable version Signed-off-by: Yevhen Vydolob --- extensions/extensions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/extensions.yml b/extensions/extensions.yml index c48be359c..ed47e9d8b 100644 --- a/extensions/extensions.yml +++ b/extensions/extensions.yml @@ -19,4 +19,4 @@ extensions: - extensions/eclipse-che-theia-plugin-ext - extensions/eclipse-che-theia-terminal - extensions/eclipse-che-theia-remote - checkoutTo: master + checkoutTo: 0.3.19 From 3fa78e839c45d3500c1f609c67ae55744cb3e225 Mon Sep 17 00:00:00 2001 From: Yevhen Vydolob Date: Fri, 8 Feb 2019 11:18:56 +0200 Subject: [PATCH 3/6] #39 set master image as 'che-theia:master' Signed-off-by: Yevhen Vydolob --- build_and_push_docker_images.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build_and_push_docker_images.sh b/build_and_push_docker_images.sh index 2abe64600..9667ff184 100755 --- a/build_and_push_docker_images.sh +++ b/build_and_push_docker_images.sh @@ -21,7 +21,6 @@ dockerfiles/theia IMAGES_LIST=( eclipse/che-theia-dev eclipse/che-theia -eclipse/che-theia-master ) @@ -29,8 +28,8 @@ eclipse/che-theia-master for image_dir in "${DOCKER_FILES_LOCATIONS[@]}" do if [ "$image_dir" == "dockerfiles/theia" ]; then - THEIA_IMAGE_TAG="nightly" - bash $(pwd)/$image_dir/build.sh --build-args:GITHUB_TOKEN=${GITHUB_TOKEN},THEIA_VERSION=master --branch:master --git-ref:refs\\/heads\\/master + THEIA_IMAGE_TAG="master" + bash $(pwd)/$image_dir/build.sh --build-args:GITHUB_TOKEN=${GITHUB_TOKEN},THEIA_VERSION=master --branch:master --git-ref:refs\\/heads\\/master elif [ "$image_dir" == "dockerfiles/theia-dev" ]; then bash $(pwd)/$image_dir/build.sh --build-arg:GITHUB_TOKEN=${GITHUB_TOKEN} else From 7001902d9aac2feb7864f3b7a8e23bca47afdd14 Mon Sep 17 00:00:00 2001 From: Yevhen Vydolob Date: Fri, 8 Feb 2019 11:54:15 +0200 Subject: [PATCH 4/6] #39 update readme file Signed-off-by: Yevhen Vydolob --- README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/README.md b/README.md index 5092596c4..34aedc8bc 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,22 @@ - [dockerfiles](./dockerfiles) contains Dockerfiles - [extensions](./extensions) contains Theia Extensions - [plugins](./plugins) contains Theia Plugins + +## How to build own che-theia image + +First you need to build `che-theia-dev` image: + +Run in `dockerfiles/theia-dev` dir: +```bash + ./build.sh --build-arg:GITHUB_TOKEN=${GITHUB_TOKEN} +``` + +> `${GITHUB_TOKEN}` there is your GitHub token: [GitHub docs](https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/) + +Then in `dockerfiles/theia` run: + +```bash +./build.sh --build-args:GITHUB_TOKEN=${GITHUB_TOKEN},THEIA_VERSION=master --branch:master --git-ref:refs\\/heads\\/master +``` + +That script will clone Theia from master branch and all Che related extensions from theirs master branches. From ab6b655a4fbd63e5a734f481c714289a083dbbac Mon Sep 17 00:00:00 2001 From: Yevhen Vydolob Date: Mon, 11 Feb 2019 09:27:57 +0200 Subject: [PATCH 5/6] #39 update readme.md Signed-off-by: Yevhen Vydolob --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 34aedc8bc..a82c056e1 100644 --- a/README.md +++ b/README.md @@ -13,15 +13,13 @@ First you need to build `che-theia-dev` image: Run in `dockerfiles/theia-dev` dir: ```bash - ./build.sh --build-arg:GITHUB_TOKEN=${GITHUB_TOKEN} + ./build.sh ``` -> `${GITHUB_TOKEN}` there is your GitHub token: [GitHub docs](https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/) - Then in `dockerfiles/theia` run: ```bash -./build.sh --build-args:GITHUB_TOKEN=${GITHUB_TOKEN},THEIA_VERSION=master --branch:master --git-ref:refs\\/heads\\/master +./build.sh --build-args:THEIA_VERSION=master --branch:master --git-ref:refs\\/heads\\/master ``` That script will clone Theia from master branch and all Che related extensions from theirs master branches. From 0f0e272130dc9e36743c09510d2a442fde9b55ef Mon Sep 17 00:00:00 2001 From: Yevhen Vydolob Date: Mon, 11 Feb 2019 09:30:41 +0200 Subject: [PATCH 6/6] #39 update docker publish script Signed-off-by: Yevhen Vydolob --- build_and_push_docker_images.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build_and_push_docker_images.sh b/build_and_push_docker_images.sh index 9667ff184..343ca44cb 100755 --- a/build_and_push_docker_images.sh +++ b/build_and_push_docker_images.sh @@ -52,6 +52,9 @@ if [ "$TRAVIS_EVENT_TYPE" == "cron" ]; then if [ "$image" == "eclipse/che-theia" ]; then docker tag ${image}:nightly ${image}:${THEIA_IMAGE_TAG} echo y | docker push ${image}:${THEIA_IMAGE_TAG} + elif ["$image" == "eclipse/che-theia-dev"]; then + docker tag ${image}:nightly ${image}:${THEIA_IMAGE_TAG} + echo y | docker push ${image}:${THEIA_IMAGE_TAG} else echo y | docker push ${image}:nightly fi