From 53d0071bbe39d70daeb0fa152c00945ba3fb67ae Mon Sep 17 00:00:00 2001 From: Roman Iuvshin Date: Fri, 11 Nov 2016 15:35:41 +0200 Subject: [PATCH] use images from eclipse org --- che-action/README.md | 6 +++--- che-action/build.bat | 2 +- che-action/build.sh | 2 +- che-dir/README.md | 2 +- che-dir/build.bat | 2 +- che-dir/build.sh | 2 +- che-launcher/build.sh | 2 +- che-launcher/launcher.sh | 2 +- che-launcher/launcher_test.bats | 4 ++-- che-mount/sync.sh | 8 ++++---- che-test/README.md | 6 +++--- che-test/build.bat | 2 +- che-test/build.sh | 2 +- lib/typescript/src/internal/dir/che-dir.ts | 2 +- lib/typescript/src/spi/docker/remoteip.ts | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/che-action/README.md b/che-action/README.md index da9221d5..ec685a22 100644 --- a/che-action/README.md +++ b/che-action/README.md @@ -8,15 +8,15 @@ $ build.sh (on Unix) ## Run container ``` -docker run --rm -v /var/run/docker.sock:/var/run/docker.sock codenvy/che-action +docker run --rm -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-action ``` ## Get available actions ``` -docker run --rm -v /var/run/docker.sock:/var/run/docker.sock codenvy/che-action +docker run --rm -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-action ``` ## Get help on a test ``` -docker run --rm -v /var/run/docker.sock:/var/run/docker.sock codenvy/che-action --help +docker run --rm -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-action --help ``` diff --git a/che-action/build.bat b/che-action/build.bat index da87f815..044aa100 100644 --- a/che-action/build.bat +++ b/che-action/build.bat @@ -4,7 +4,7 @@ for %%i in ("%~dp0..") do set "folder=%%~fi" echo "Building Docker Image from %folder% directory with tag %tag%" cd %folder% echo current folder is %cd% -docker build -t codenvy/che-action:nightly -f che-action/Dockerfile . +docker build -t eclipse/che-action:nightly -f che-action/Dockerfile . if %ERRORLEVEL% == 0 goto :end diff --git a/che-action/build.sh b/che-action/build.sh index ea17233d..c895f200 100755 --- a/che-action/build.sh +++ b/che-action/build.sh @@ -14,4 +14,4 @@ fi DIR=$(cd "$(dirname "$0")"; cd ..; pwd) echo "Building Docker Image from $DIR directory with tag $TAG" -cd $DIR && docker build -t codenvy/che-action:$TAG -f che-action/Dockerfile . +cd $DIR && docker build -t eclipse/che-action:$TAG -f che-action/Dockerfile . diff --git a/che-dir/README.md b/che-dir/README.md index 606ee4e3..81097d88 100644 --- a/che-dir/README.md +++ b/che-dir/README.md @@ -26,7 +26,7 @@ $ cd web-java-spring-petclinic Run script ``` docker run -v /var/run/docker.sock:/var/run/docker.sock \ - -v "$PWD":"$PWD" --rm codenvy/che-file \ + -v "$PWD":"$PWD" --rm eclipse/che-file \ $PWD ``` diff --git a/che-dir/build.bat b/che-dir/build.bat index 5b390aed..8515632c 100644 --- a/che-dir/build.bat +++ b/che-dir/build.bat @@ -4,7 +4,7 @@ for %%i in ("%~dp0..") do set "folder=%%~fi" echo "Building Docker Image from %folder% directory with tag %tag%" cd %folder% echo current folder is %cd% -docker build -t codenvy/che-dir:nightly -f che-dir/Dockerfile . +docker build -t eclipse/che-dir:nightly -f che-dir/Dockerfile . if %ERRORLEVEL% == 0 goto :end diff --git a/che-dir/build.sh b/che-dir/build.sh index 013c1263..b4723faa 100755 --- a/che-dir/build.sh +++ b/che-dir/build.sh @@ -14,4 +14,4 @@ fi DIR=$(cd "$(dirname "$0")"; cd ..; pwd) echo "Building Docker Image from $DIR directory with tag $TAG" -cd $DIR && docker build -t codenvy/che-dir:$TAG -f che-dir/Dockerfile . +cd $DIR && docker build -t eclipse/che-dir:$TAG -f che-dir/Dockerfile . diff --git a/che-launcher/build.sh b/che-launcher/build.sh index 57f7b04d..d1f50775 100755 --- a/che-launcher/build.sh +++ b/che-launcher/build.sh @@ -11,4 +11,4 @@ else TAG="nightly" fi -docker build -t codenvy/che-launcher:$TAG . \ No newline at end of file +docker build -t eclipse/che-launcher:$TAG . \ No newline at end of file diff --git a/che-launcher/launcher.sh b/che-launcher/launcher.sh index fc143fb9..f47fed01 100755 --- a/che-launcher/launcher.sh +++ b/che-launcher/launcher.sh @@ -51,7 +51,7 @@ init_global_variables() { DEFAULT_CHE_PRODUCT_NAME="ECLIPSE CHE" DEFAULT_CHE_MINI_PRODUCT_NAME="che" DEFAULT_CHE_SERVER_CONTAINER_NAME="che-server" - DEFAULT_CHE_SERVER_IMAGE_NAME="codenvy/che-server" + DEFAULT_CHE_SERVER_IMAGE_NAME="eclipse/che-server" DEFAULT_DOCKER_HOST_IP=$(get_docker_host_ip) DEFAULT_CHE_HOSTNAME=$(get_che_hostname) DEFAULT_CHE_PORT="8080" diff --git a/che-launcher/launcher_test.bats b/che-launcher/launcher_test.bats index 8b76d16e..fb8840df 100644 --- a/che-launcher/launcher_test.bats +++ b/che-launcher/launcher_test.bats @@ -149,7 +149,7 @@ source ./launcher_funcs.sh @test "get che get che launcher version with nightly" { # Given export CHE_SERVER_CONTAINER_NAME="che-test-get-che-launcher-version" - long_id=$(docker run -d --name ${CHE_SERVER_CONTAINER_NAME} --entrypoint=true codenvy/che-launcher:nightly) + long_id=$(docker run -d --name ${CHE_SERVER_CONTAINER_NAME} --entrypoint=true eclipse/che-launcher:nightly) get_che_launcher_container_id() { echo ${long_id:0:12} @@ -166,7 +166,7 @@ source ./launcher_funcs.sh @test "get che get che launcher version with no specific version" { # Given export CHE_SERVER_CONTAINER_NAME="che-test-get-che-launcher-version" - long_id=$(docker run -d --name ${CHE_SERVER_CONTAINER_NAME} --entrypoint=true codenvy/che-launcher) + long_id=$(docker run -d --name ${CHE_SERVER_CONTAINER_NAME} --entrypoint=true eclipse/che-launcher) get_che_launcher_container_id() { echo ${long_id:0:12} diff --git a/che-mount/sync.sh b/che-mount/sync.sh index 720a6912..8b321bfd 100755 --- a/che-mount/sync.sh +++ b/che-mount/sync.sh @@ -26,7 +26,7 @@ Usage on Linux -v /etc/passwd:/etc/passwd:ro -v :/profile -u \$(id -u \${USER}) - -v /:/mnthost codenvy/che-mount + -v /:/mnthost eclipse/che-mount ID or Name of the workspace or namespace:workspace-name @@ -34,7 +34,7 @@ Usage on Mac or Windows: docker run --rm -it --cap-add SYS_ADMIN --device /dev/fuse --name che-mount -v :/profile - -v /:/mnthost codenvy/che-mount + -v /:/mnthost eclipse/che-mount ID or Name of the workspace or namespace:workspace-name " @@ -98,11 +98,11 @@ if [ $status -ne 0 ]; then exit 1 fi -docker run --rm -v /var/run/docker.sock:/var/run/docker.sock codenvy/che-action:${CHE_VERSION} get-ssh-data ${WORKSPACE_NAME} ${COMMAND_EXTRA_ARGS} > $HOME/env +docker run --rm -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-action:${CHE_VERSION} get-ssh-data ${WORKSPACE_NAME} ${COMMAND_EXTRA_ARGS} > $HOME/env if [ $? -ne 0 ]; then error "ERROR: Error when trying to get workspace data for workspace named ${WORKSPACE_NAME}" echo "List of workspaces are:" - docker run --rm -v /var/run/docker.sock:/var/run/docker.sock codenvy/che-action:${CHE_VERSION} list-workspaces + docker run --rm -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-action:${CHE_VERSION} list-workspaces return 1 fi diff --git a/che-test/README.md b/che-test/README.md index 92375d2d..fed8c19d 100644 --- a/che-test/README.md +++ b/che-test/README.md @@ -8,16 +8,16 @@ $ build.sh (on Unix) ## Run a test ``` -docker run --rm -v /var/run/docker.sock:/var/run/docker.sock codenvy/che-test +docker run --rm -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-test ``` ## Get available tests ``` -docker run --rm -v /var/run/docker.sock:/var/run/docker.sock codenvy/che-test +docker run --rm -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-test ``` ## Get help on a test ``` -docker run --rm -v /var/run/docker.sock:/var/run/docker.sock codenvy/che-test --help +docker run --rm -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-test --help ``` diff --git a/che-test/build.bat b/che-test/build.bat index b9d669a1..958a1945 100644 --- a/che-test/build.bat +++ b/che-test/build.bat @@ -4,7 +4,7 @@ for %%i in ("%~dp0..") do set "folder=%%~fi" echo "Building Docker Image from %folder% directory with tag %tag%" cd %folder% echo current folder is %cd% -docker build -t codenvy/che-test:nightly -f che-test/Dockerfile . +docker build -t eclipse/che-test:nightly -f che-test/Dockerfile . if %ERRORLEVEL% == 0 goto :end diff --git a/che-test/build.sh b/che-test/build.sh index c604faf9..8cf115b5 100755 --- a/che-test/build.sh +++ b/che-test/build.sh @@ -14,4 +14,4 @@ fi DIR=$(cd "$(dirname "$0")"; cd ..; pwd) echo "Building Docker Image from $DIR directory with tag $TAG" -cd $DIR && docker build -t codenvy/che-test:$TAG -f che-test/Dockerfile . +cd $DIR && docker build -t eclipse/che-test:$TAG -f che-test/Dockerfile . diff --git a/lib/typescript/src/internal/dir/che-dir.ts b/lib/typescript/src/internal/dir/che-dir.ts index ad5608b1..77124f88 100644 --- a/lib/typescript/src/internal/dir/che-dir.ts +++ b/lib/typescript/src/internal/dir/che-dir.ts @@ -112,7 +112,7 @@ export class CheDir { if (process.env.CHE_LAUNCHER_IMAGE_NAME) { this.cheLauncherImageName = process.env.CHE_LAUNCHER_IMAGE_NAME } else { - this.cheLauncherImageName = 'codenvy/che-launcher'; + this.cheLauncherImageName = 'eclipse/che-launcher'; } } diff --git a/lib/typescript/src/spi/docker/remoteip.ts b/lib/typescript/src/spi/docker/remoteip.ts index d89b9242..73378676 100644 --- a/lib/typescript/src/spi/docker/remoteip.ts +++ b/lib/typescript/src/spi/docker/remoteip.ts @@ -22,7 +22,7 @@ export class RemoteIp { if (!RemoteIp.ip) { var execSync = require('child_process').execSync; let containerVersion : string = new ContainerVersion().getVersion(); - RemoteIp.ip = execSync('docker run --net host --rm codenvy/che-ip:' + containerVersion).toString().replace(/[\n\r]/g, ''); + RemoteIp.ip = execSync('docker run --net host --rm eclipse/che-ip:' + containerVersion).toString().replace(/[\n\r]/g, ''); } }