Skip to content
This repository has been archived by the owner on Feb 2, 2022. It is now read-only.

Commit

Permalink
use images from eclipse org
Browse files Browse the repository at this point in the history
  • Loading branch information
Roman Iuvshin committed Nov 11, 2016
1 parent 5167bb1 commit 53d0071
Show file tree
Hide file tree
Showing 15 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions che-action/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <name-of-action>
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-action <name-of-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 <name-of-action> --help
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-action <name-of-action> --help
```
2 changes: 1 addition & 1 deletion che-action/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion che-action/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
2 changes: 1 addition & 1 deletion che-dir/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <init|up>
```

Expand Down
2 changes: 1 addition & 1 deletion che-dir/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion che-dir/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
2 changes: 1 addition & 1 deletion che-launcher/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ else
TAG="nightly"
fi

docker build -t codenvy/che-launcher:$TAG .
docker build -t eclipse/che-launcher:$TAG .
2 changes: 1 addition & 1 deletion che-launcher/launcher.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions che-launcher/launcher_test.bats
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
Expand Down
8 changes: 4 additions & 4 deletions che-mount/sync.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ Usage on Linux
-v /etc/passwd:/etc/passwd:ro
-v <path-to-sync-profile>:/profile
-u \$(id -u \${USER})
-v <local-mount>/:/mnthost codenvy/che-mount <workspace-id|workspace-name>
-v <local-mount>/:/mnthost eclipse/che-mount <workspace-id|workspace-name>
<workspace-id|workspace-name> ID or Name of the workspace or namespace:workspace-name
Usage on Mac or Windows:
docker run --rm -it --cap-add SYS_ADMIN --device /dev/fuse
--name che-mount
-v <path-to-sync-profile>:/profile
-v <local-mount>/:/mnthost codenvy/che-mount <workspace-id|workspace-name>
-v <local-mount>/:/mnthost eclipse/che-mount <workspace-id|workspace-name>
<workspace-id|workspace-name> ID or Name of the workspace or namespace:workspace-name
"
Expand Down Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions che-test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <name-of-test>
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-test <name-of-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 <name-of-test> --help
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-test <name-of-test> --help
```

2 changes: 1 addition & 1 deletion che-test/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion che-test/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
2 changes: 1 addition & 1 deletion lib/typescript/src/internal/dir/che-dir.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
}

Expand Down
2 changes: 1 addition & 1 deletion lib/typescript/src/spi/docker/remoteip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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, '');
}
}

Expand Down

0 comments on commit 53d0071

Please sign in to comment.