From a5d0a5e242b29c17ae12c4bafe1b2a29b4ce552b Mon Sep 17 00:00:00 2001 From: Florent BENOIT Date: Fri, 2 Dec 2016 01:41:50 -0700 Subject: [PATCH] - Rename base-cli folder to base (#3255) - Rename lib-typescript folder to lib - Update docker image eclipse/che-lib-typescript to be eclipse/che-lib Change-Id: I878b52853a424f14cdec74074055d52dc8e198fd Signed-off-by: Florent BENOIT --- dockerfiles/action/Dockerfile | 2 +- dockerfiles/{base-cli => base}/Dockerfile | 0 dockerfiles/{base-cli => base}/build.sh | 0 .../{base-cli => base}/scripts/base/cli/cli-functions.sh | 0 .../{base-cli => base}/scripts/base/commands/cmd_action.sh | 0 .../{base-cli => base}/scripts/base/commands/cmd_backup.sh | 0 .../{base-cli => base}/scripts/base/commands/cmd_config.sh | 0 .../{base-cli => base}/scripts/base/commands/cmd_debug.sh | 0 .../scripts/base/commands/cmd_destroy.sh | 0 .../scripts/base/commands/cmd_download.sh | 0 .../{base-cli => base}/scripts/base/commands/cmd_help.sh | 0 .../{base-cli => base}/scripts/base/commands/cmd_info.sh | 0 .../{base-cli => base}/scripts/base/commands/cmd_init.sh | 0 .../scripts/base/commands/cmd_network.sh | 0 .../scripts/base/commands/cmd_offline.sh | 0 .../scripts/base/commands/cmd_restore.sh | 0 .../{base-cli => base}/scripts/base/commands/cmd_rmi.sh | 0 .../{base-cli => base}/scripts/base/commands/cmd_ssh.sh | 0 .../{base-cli => base}/scripts/base/commands/cmd_start.sh | 0 .../{base-cli => base}/scripts/base/commands/cmd_sync.sh | 0 .../scripts/base/commands/cmd_upgrade.sh | 0 .../scripts/base/commands/cmd_version.sh | 0 dockerfiles/{base-cli => base}/scripts/base/curl.sh | 0 dockerfiles/{base-cli => base}/scripts/base/docker.sh | 0 dockerfiles/{base-cli => base}/scripts/base/paths.sh | 0 dockerfiles/{base-cli => base}/scripts/base/startup.sh | 0 dockerfiles/build-all.sh | 2 +- dockerfiles/dir/Dockerfile | 2 +- dockerfiles/{lib-typescript => lib}/.babelrc | 0 dockerfiles/{lib-typescript => lib}/.dockerignore | 0 dockerfiles/{lib-typescript => lib}/.gitignore | 0 dockerfiles/{lib-typescript => lib}/Dockerfile | 7 ++++--- dockerfiles/{lib-typescript => lib}/Dockerfile.dev | 0 dockerfiles/{lib-typescript => lib}/README.md | 0 dockerfiles/{lib-typescript => lib}/build.sh | 2 +- dockerfiles/{lib-typescript => lib}/dto-pom.xml | 0 dockerfiles/{lib-typescript => lib}/package.json | 4 ++-- .../runtime-dependencies/package.json | 0 dockerfiles/{lib-typescript => lib}/src/api/dto/che-dto.ts | 0 .../src/api/wsmaster/auth/auth-data.ts | 0 .../src/api/wsmaster/machine/machine-service-client.ts | 0 .../api/wsmaster/machine/process-log-output-subscriber.ts | 0 .../machine/process-terminated-event-promise-subscriber.ts | 0 .../src/api/wsmaster/permissions/dto/domaindto.ts | 0 .../src/api/wsmaster/permissions/dto/permissiondto.ts | 0 .../src/api/wsmaster/permissions/permissions.ts | 0 .../src/api/wsmaster/project/project.ts | 0 .../{lib-typescript => lib}/src/api/wsmaster/ssh/ssh.ts | 0 .../{lib-typescript => lib}/src/api/wsmaster/user/user.ts | 0 .../wsmaster/workspace/workspace-log-output-subscriber.ts | 0 .../workspace/workspace-start-event-promise-subscriber.ts | 0 .../workspace/workspace-stop-event-promise-subscriber.ts | 0 .../src/api/wsmaster/workspace/workspace.ts | 0 dockerfiles/{lib-typescript => lib}/src/index.ts | 0 .../src/internal/action/che-action.ts | 0 .../src/internal/action/impl/add-user-action.ts | 0 .../internal/action/impl/create-start-workspace-action.ts | 0 .../src/internal/action/impl/execute-command-action.ts | 0 .../src/internal/action/impl/get-ssh-action.ts | 0 .../src/internal/action/impl/list-workspaces-action.ts | 0 .../src/internal/action/impl/remove-user-action.ts | 0 .../src/internal/action/impl/workspace-ssh-action.ts | 0 .../src/internal/dir/che-dir-constant.properties | 0 .../{lib-typescript => lib}/src/internal/dir/che-dir.ts | 0 .../src/internal/dir/chefile-struct/che-file-struct.ts | 0 .../{lib-typescript => lib}/src/internal/test/che-test.ts | 0 .../internal/test/impl/post-flight-check-test.properties | 0 .../src/internal/test/impl/post-flight-check-test.ts | 0 .../src/spi/ascii/ascii-array-info.ts | 0 .../{lib-typescript => lib}/src/spi/ascii/ascii-array.ts | 0 .../src/spi/ascii/ascii-form-entry.ts | 0 .../src/spi/ascii/ascii-form-info.ts | 0 .../{lib-typescript => lib}/src/spi/ascii/ascii-form.ts | 0 .../{lib-typescript => lib}/src/spi/ascii/ascii-format.ts | 0 .../src/spi/ascii/ascii-formatter.ts | 0 .../{lib-typescript => lib}/src/spi/ascii/csv-formatter.ts | 0 .../src/spi/ascii/default-ascii-array.spec.ts | 0 .../src/spi/ascii/default-ascii-array.ts | 0 .../src/spi/ascii/default-ascii-form.spec.ts | 0 .../src/spi/ascii/default-ascii-form.ts | 0 .../src/spi/ascii/formatter-mode.ts | 0 .../src/spi/ascii/modern-formatter.ts | 0 .../src/spi/decorator/argument-processor.ts | 0 .../{lib-typescript => lib}/src/spi/decorator/message.ts | 0 .../{lib-typescript => lib}/src/spi/decorator/parameter.ts | 0 .../src/spi/docker/container-version.ts | 0 .../src/spi/docker/recipebuilder.ts | 0 .../{lib-typescript => lib}/src/spi/docker/remoteip.ts | 0 .../src/spi/docker/ssh-generator.ts | 0 .../src/spi/http/default-http-json-request.ts | 0 dockerfiles/{lib-typescript => lib}/src/spi/i18n/i18n.ts | 0 dockerfiles/{lib-typescript => lib}/src/spi/index.ts | 0 dockerfiles/{lib-typescript => lib}/src/spi/log/log.ts | 0 .../src/spi/websocket/messagebuilder.ts | 0 .../src/spi/websocket/messagebus-subscriber.ts | 0 .../src/spi/websocket/messagebus.ts | 0 .../{lib-typescript => lib}/src/spi/websocket/websocket.ts | 0 dockerfiles/{lib-typescript => lib}/src/utils/index.ts | 0 .../{lib-typescript => lib}/src/utils/product-name.ts | 0 .../{lib-typescript => lib}/src/utils/string-utils.spec.ts | 0 .../{lib-typescript => lib}/src/utils/string-utils.ts | 0 dockerfiles/{lib-typescript => lib}/src/utils/uuid.ts | 0 dockerfiles/{lib-typescript => lib}/tsconfig.json | 0 dockerfiles/test/Dockerfile | 2 +- 104 files changed, 11 insertions(+), 10 deletions(-) rename dockerfiles/{base-cli => base}/Dockerfile (100%) rename dockerfiles/{base-cli => base}/build.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/cli/cli-functions.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_action.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_backup.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_config.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_debug.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_destroy.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_download.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_help.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_info.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_init.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_network.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_offline.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_restore.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_rmi.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_ssh.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_start.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_sync.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_upgrade.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/commands/cmd_version.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/curl.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/docker.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/paths.sh (100%) rename dockerfiles/{base-cli => base}/scripts/base/startup.sh (100%) rename dockerfiles/{lib-typescript => lib}/.babelrc (100%) rename dockerfiles/{lib-typescript => lib}/.dockerignore (100%) rename dockerfiles/{lib-typescript => lib}/.gitignore (100%) rename dockerfiles/{lib-typescript => lib}/Dockerfile (88%) rename dockerfiles/{lib-typescript => lib}/Dockerfile.dev (100%) rename dockerfiles/{lib-typescript => lib}/README.md (100%) rename dockerfiles/{lib-typescript => lib}/build.sh (98%) rename dockerfiles/{lib-typescript => lib}/dto-pom.xml (100%) rename dockerfiles/{lib-typescript => lib}/package.json (92%) rename dockerfiles/{lib-typescript => lib}/runtime-dependencies/package.json (100%) rename dockerfiles/{lib-typescript => lib}/src/api/dto/che-dto.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/api/wsmaster/auth/auth-data.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/api/wsmaster/machine/machine-service-client.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/api/wsmaster/machine/process-log-output-subscriber.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/api/wsmaster/machine/process-terminated-event-promise-subscriber.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/api/wsmaster/permissions/dto/domaindto.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/api/wsmaster/permissions/dto/permissiondto.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/api/wsmaster/permissions/permissions.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/api/wsmaster/project/project.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/api/wsmaster/ssh/ssh.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/api/wsmaster/user/user.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/api/wsmaster/workspace/workspace-log-output-subscriber.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/api/wsmaster/workspace/workspace-start-event-promise-subscriber.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/api/wsmaster/workspace/workspace-stop-event-promise-subscriber.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/api/wsmaster/workspace/workspace.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/index.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/internal/action/che-action.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/internal/action/impl/add-user-action.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/internal/action/impl/create-start-workspace-action.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/internal/action/impl/execute-command-action.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/internal/action/impl/get-ssh-action.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/internal/action/impl/list-workspaces-action.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/internal/action/impl/remove-user-action.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/internal/action/impl/workspace-ssh-action.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/internal/dir/che-dir-constant.properties (100%) rename dockerfiles/{lib-typescript => lib}/src/internal/dir/che-dir.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/internal/dir/chefile-struct/che-file-struct.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/internal/test/che-test.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/internal/test/impl/post-flight-check-test.properties (100%) rename dockerfiles/{lib-typescript => lib}/src/internal/test/impl/post-flight-check-test.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/ascii/ascii-array-info.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/ascii/ascii-array.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/ascii/ascii-form-entry.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/ascii/ascii-form-info.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/ascii/ascii-form.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/ascii/ascii-format.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/ascii/ascii-formatter.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/ascii/csv-formatter.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/ascii/default-ascii-array.spec.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/ascii/default-ascii-array.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/ascii/default-ascii-form.spec.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/ascii/default-ascii-form.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/ascii/formatter-mode.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/ascii/modern-formatter.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/decorator/argument-processor.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/decorator/message.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/decorator/parameter.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/docker/container-version.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/docker/recipebuilder.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/docker/remoteip.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/docker/ssh-generator.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/http/default-http-json-request.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/i18n/i18n.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/index.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/log/log.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/websocket/messagebuilder.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/websocket/messagebus-subscriber.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/websocket/messagebus.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/spi/websocket/websocket.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/utils/index.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/utils/product-name.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/utils/string-utils.spec.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/utils/string-utils.ts (100%) rename dockerfiles/{lib-typescript => lib}/src/utils/uuid.ts (100%) rename dockerfiles/{lib-typescript => lib}/tsconfig.json (100%) diff --git a/dockerfiles/action/Dockerfile b/dockerfiles/action/Dockerfile index 712b9f1d54..fb41f7e329 100644 --- a/dockerfiles/action/Dockerfile +++ b/dockerfiles/action/Dockerfile @@ -10,6 +10,6 @@ # use: # docker run -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-action [command] -FROM eclipse/che-lib-typescript:nightly +FROM eclipse/che-lib:nightly ENTRYPOINT ["node", "/che-lib/index.js", "che-action"] diff --git a/dockerfiles/base-cli/Dockerfile b/dockerfiles/base/Dockerfile similarity index 100% rename from dockerfiles/base-cli/Dockerfile rename to dockerfiles/base/Dockerfile diff --git a/dockerfiles/base-cli/build.sh b/dockerfiles/base/build.sh similarity index 100% rename from dockerfiles/base-cli/build.sh rename to dockerfiles/base/build.sh diff --git a/dockerfiles/base-cli/scripts/base/cli/cli-functions.sh b/dockerfiles/base/scripts/base/cli/cli-functions.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/cli/cli-functions.sh rename to dockerfiles/base/scripts/base/cli/cli-functions.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_action.sh b/dockerfiles/base/scripts/base/commands/cmd_action.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_action.sh rename to dockerfiles/base/scripts/base/commands/cmd_action.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_backup.sh b/dockerfiles/base/scripts/base/commands/cmd_backup.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_backup.sh rename to dockerfiles/base/scripts/base/commands/cmd_backup.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_config.sh b/dockerfiles/base/scripts/base/commands/cmd_config.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_config.sh rename to dockerfiles/base/scripts/base/commands/cmd_config.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_debug.sh b/dockerfiles/base/scripts/base/commands/cmd_debug.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_debug.sh rename to dockerfiles/base/scripts/base/commands/cmd_debug.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_destroy.sh b/dockerfiles/base/scripts/base/commands/cmd_destroy.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_destroy.sh rename to dockerfiles/base/scripts/base/commands/cmd_destroy.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_download.sh b/dockerfiles/base/scripts/base/commands/cmd_download.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_download.sh rename to dockerfiles/base/scripts/base/commands/cmd_download.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_help.sh b/dockerfiles/base/scripts/base/commands/cmd_help.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_help.sh rename to dockerfiles/base/scripts/base/commands/cmd_help.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_info.sh b/dockerfiles/base/scripts/base/commands/cmd_info.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_info.sh rename to dockerfiles/base/scripts/base/commands/cmd_info.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_init.sh b/dockerfiles/base/scripts/base/commands/cmd_init.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_init.sh rename to dockerfiles/base/scripts/base/commands/cmd_init.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_network.sh b/dockerfiles/base/scripts/base/commands/cmd_network.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_network.sh rename to dockerfiles/base/scripts/base/commands/cmd_network.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_offline.sh b/dockerfiles/base/scripts/base/commands/cmd_offline.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_offline.sh rename to dockerfiles/base/scripts/base/commands/cmd_offline.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_restore.sh b/dockerfiles/base/scripts/base/commands/cmd_restore.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_restore.sh rename to dockerfiles/base/scripts/base/commands/cmd_restore.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_rmi.sh b/dockerfiles/base/scripts/base/commands/cmd_rmi.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_rmi.sh rename to dockerfiles/base/scripts/base/commands/cmd_rmi.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_ssh.sh b/dockerfiles/base/scripts/base/commands/cmd_ssh.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_ssh.sh rename to dockerfiles/base/scripts/base/commands/cmd_ssh.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_start.sh b/dockerfiles/base/scripts/base/commands/cmd_start.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_start.sh rename to dockerfiles/base/scripts/base/commands/cmd_start.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_sync.sh b/dockerfiles/base/scripts/base/commands/cmd_sync.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_sync.sh rename to dockerfiles/base/scripts/base/commands/cmd_sync.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_upgrade.sh b/dockerfiles/base/scripts/base/commands/cmd_upgrade.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_upgrade.sh rename to dockerfiles/base/scripts/base/commands/cmd_upgrade.sh diff --git a/dockerfiles/base-cli/scripts/base/commands/cmd_version.sh b/dockerfiles/base/scripts/base/commands/cmd_version.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/commands/cmd_version.sh rename to dockerfiles/base/scripts/base/commands/cmd_version.sh diff --git a/dockerfiles/base-cli/scripts/base/curl.sh b/dockerfiles/base/scripts/base/curl.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/curl.sh rename to dockerfiles/base/scripts/base/curl.sh diff --git a/dockerfiles/base-cli/scripts/base/docker.sh b/dockerfiles/base/scripts/base/docker.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/docker.sh rename to dockerfiles/base/scripts/base/docker.sh diff --git a/dockerfiles/base-cli/scripts/base/paths.sh b/dockerfiles/base/scripts/base/paths.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/paths.sh rename to dockerfiles/base/scripts/base/paths.sh diff --git a/dockerfiles/base-cli/scripts/base/startup.sh b/dockerfiles/base/scripts/base/startup.sh similarity index 100% rename from dockerfiles/base-cli/scripts/base/startup.sh rename to dockerfiles/base/scripts/base/startup.sh diff --git a/dockerfiles/build-all.sh b/dockerfiles/build-all.sh index 5dc2bea4f0..6ae302564d 100755 --- a/dockerfiles/build-all.sh +++ b/dockerfiles/build-all.sh @@ -13,7 +13,7 @@ set -u init # loop on all libraries first -for directory in lib-*/ ; do +for directory in lib*/ ; do if [[ -e ${directory}/build.sh ]] ; then echo "Call buid.sh from ${directory}" ${directory}build.sh "$@" diff --git a/dockerfiles/dir/Dockerfile b/dockerfiles/dir/Dockerfile index 7a1802e008..26c1d378df 100644 --- a/dockerfiles/dir/Dockerfile +++ b/dockerfiles/dir/Dockerfile @@ -10,6 +10,6 @@ # use: # docker run -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-dir [command] -FROM eclipse/che-lib-typescript:nightly +FROM eclipse/che-lib:nightly ENTRYPOINT ["node", "/che-lib/index.js", "che-dir"] diff --git a/dockerfiles/lib-typescript/.babelrc b/dockerfiles/lib/.babelrc similarity index 100% rename from dockerfiles/lib-typescript/.babelrc rename to dockerfiles/lib/.babelrc diff --git a/dockerfiles/lib-typescript/.dockerignore b/dockerfiles/lib/.dockerignore similarity index 100% rename from dockerfiles/lib-typescript/.dockerignore rename to dockerfiles/lib/.dockerignore diff --git a/dockerfiles/lib-typescript/.gitignore b/dockerfiles/lib/.gitignore similarity index 100% rename from dockerfiles/lib-typescript/.gitignore rename to dockerfiles/lib/.gitignore diff --git a/dockerfiles/lib-typescript/Dockerfile b/dockerfiles/lib/Dockerfile similarity index 88% rename from dockerfiles/lib-typescript/Dockerfile rename to dockerfiles/lib/Dockerfile index 778d7a4c7c..dfdc03b9ed 100644 --- a/dockerfiles/lib-typescript/Dockerfile +++ b/dockerfiles/lib/Dockerfile @@ -4,9 +4,11 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html # -# Contributors: -# Codenvy, S.A. - Initial implementation +# build: +# docker build -t eclipse/che-lib . # +# use: +# docker run -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-lib [command] FROM mhart/alpine-node:6 @@ -29,4 +31,3 @@ RUN cd /lib-typescript/ && npm install \ && cd /runtime && npm install && /lib-typescript/node_modules/.bin/tsc --project /lib-typescript/ \ && mv /lib-typescript/lib /che-lib && cd /lib-typescript/src && find . -name "*.properties" -exec install -D {} /che-lib/{} \;\ && rm -rf /lib-typescript && mv /runtime/node_modules /che-lib && rm -rf /runtime - diff --git a/dockerfiles/lib-typescript/Dockerfile.dev b/dockerfiles/lib/Dockerfile.dev similarity index 100% rename from dockerfiles/lib-typescript/Dockerfile.dev rename to dockerfiles/lib/Dockerfile.dev diff --git a/dockerfiles/lib-typescript/README.md b/dockerfiles/lib/README.md similarity index 100% rename from dockerfiles/lib-typescript/README.md rename to dockerfiles/lib/README.md diff --git a/dockerfiles/lib-typescript/build.sh b/dockerfiles/lib/build.sh similarity index 98% rename from dockerfiles/lib-typescript/build.sh rename to dockerfiles/lib/build.sh index 0a163bb521..40720258b9 100755 --- a/dockerfiles/lib-typescript/build.sh +++ b/dockerfiles/lib/build.sh @@ -5,7 +5,7 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -IMAGE_NAME="eclipse/che-lib-typescript" +IMAGE_NAME="eclipse/che-lib" . $(cd "$(dirname "$0")"; pwd)/../build.include DIR=$(cd "$(dirname "$0")"; pwd) diff --git a/dockerfiles/lib-typescript/dto-pom.xml b/dockerfiles/lib/dto-pom.xml similarity index 100% rename from dockerfiles/lib-typescript/dto-pom.xml rename to dockerfiles/lib/dto-pom.xml diff --git a/dockerfiles/lib-typescript/package.json b/dockerfiles/lib/package.json similarity index 92% rename from dockerfiles/lib-typescript/package.json rename to dockerfiles/lib/package.json index 5a4bae8484..fd99805fae 100644 --- a/dockerfiles/lib-typescript/package.json +++ b/dockerfiles/lib/package.json @@ -1,7 +1,7 @@ { - "name": "che-typescript", + "name": "che-cli-library", "version": "1.0.0", - "description": "TypeScript library used in dockerfiles", + "description": "CLI library used in dockerfiles", "main": "lib/index.js", "author": "Florent Benoit", "license": "EPL-1.0", diff --git a/dockerfiles/lib-typescript/runtime-dependencies/package.json b/dockerfiles/lib/runtime-dependencies/package.json similarity index 100% rename from dockerfiles/lib-typescript/runtime-dependencies/package.json rename to dockerfiles/lib/runtime-dependencies/package.json diff --git a/dockerfiles/lib-typescript/src/api/dto/che-dto.ts b/dockerfiles/lib/src/api/dto/che-dto.ts similarity index 100% rename from dockerfiles/lib-typescript/src/api/dto/che-dto.ts rename to dockerfiles/lib/src/api/dto/che-dto.ts diff --git a/dockerfiles/lib-typescript/src/api/wsmaster/auth/auth-data.ts b/dockerfiles/lib/src/api/wsmaster/auth/auth-data.ts similarity index 100% rename from dockerfiles/lib-typescript/src/api/wsmaster/auth/auth-data.ts rename to dockerfiles/lib/src/api/wsmaster/auth/auth-data.ts diff --git a/dockerfiles/lib-typescript/src/api/wsmaster/machine/machine-service-client.ts b/dockerfiles/lib/src/api/wsmaster/machine/machine-service-client.ts similarity index 100% rename from dockerfiles/lib-typescript/src/api/wsmaster/machine/machine-service-client.ts rename to dockerfiles/lib/src/api/wsmaster/machine/machine-service-client.ts diff --git a/dockerfiles/lib-typescript/src/api/wsmaster/machine/process-log-output-subscriber.ts b/dockerfiles/lib/src/api/wsmaster/machine/process-log-output-subscriber.ts similarity index 100% rename from dockerfiles/lib-typescript/src/api/wsmaster/machine/process-log-output-subscriber.ts rename to dockerfiles/lib/src/api/wsmaster/machine/process-log-output-subscriber.ts diff --git a/dockerfiles/lib-typescript/src/api/wsmaster/machine/process-terminated-event-promise-subscriber.ts b/dockerfiles/lib/src/api/wsmaster/machine/process-terminated-event-promise-subscriber.ts similarity index 100% rename from dockerfiles/lib-typescript/src/api/wsmaster/machine/process-terminated-event-promise-subscriber.ts rename to dockerfiles/lib/src/api/wsmaster/machine/process-terminated-event-promise-subscriber.ts diff --git a/dockerfiles/lib-typescript/src/api/wsmaster/permissions/dto/domaindto.ts b/dockerfiles/lib/src/api/wsmaster/permissions/dto/domaindto.ts similarity index 100% rename from dockerfiles/lib-typescript/src/api/wsmaster/permissions/dto/domaindto.ts rename to dockerfiles/lib/src/api/wsmaster/permissions/dto/domaindto.ts diff --git a/dockerfiles/lib-typescript/src/api/wsmaster/permissions/dto/permissiondto.ts b/dockerfiles/lib/src/api/wsmaster/permissions/dto/permissiondto.ts similarity index 100% rename from dockerfiles/lib-typescript/src/api/wsmaster/permissions/dto/permissiondto.ts rename to dockerfiles/lib/src/api/wsmaster/permissions/dto/permissiondto.ts diff --git a/dockerfiles/lib-typescript/src/api/wsmaster/permissions/permissions.ts b/dockerfiles/lib/src/api/wsmaster/permissions/permissions.ts similarity index 100% rename from dockerfiles/lib-typescript/src/api/wsmaster/permissions/permissions.ts rename to dockerfiles/lib/src/api/wsmaster/permissions/permissions.ts diff --git a/dockerfiles/lib-typescript/src/api/wsmaster/project/project.ts b/dockerfiles/lib/src/api/wsmaster/project/project.ts similarity index 100% rename from dockerfiles/lib-typescript/src/api/wsmaster/project/project.ts rename to dockerfiles/lib/src/api/wsmaster/project/project.ts diff --git a/dockerfiles/lib-typescript/src/api/wsmaster/ssh/ssh.ts b/dockerfiles/lib/src/api/wsmaster/ssh/ssh.ts similarity index 100% rename from dockerfiles/lib-typescript/src/api/wsmaster/ssh/ssh.ts rename to dockerfiles/lib/src/api/wsmaster/ssh/ssh.ts diff --git a/dockerfiles/lib-typescript/src/api/wsmaster/user/user.ts b/dockerfiles/lib/src/api/wsmaster/user/user.ts similarity index 100% rename from dockerfiles/lib-typescript/src/api/wsmaster/user/user.ts rename to dockerfiles/lib/src/api/wsmaster/user/user.ts diff --git a/dockerfiles/lib-typescript/src/api/wsmaster/workspace/workspace-log-output-subscriber.ts b/dockerfiles/lib/src/api/wsmaster/workspace/workspace-log-output-subscriber.ts similarity index 100% rename from dockerfiles/lib-typescript/src/api/wsmaster/workspace/workspace-log-output-subscriber.ts rename to dockerfiles/lib/src/api/wsmaster/workspace/workspace-log-output-subscriber.ts diff --git a/dockerfiles/lib-typescript/src/api/wsmaster/workspace/workspace-start-event-promise-subscriber.ts b/dockerfiles/lib/src/api/wsmaster/workspace/workspace-start-event-promise-subscriber.ts similarity index 100% rename from dockerfiles/lib-typescript/src/api/wsmaster/workspace/workspace-start-event-promise-subscriber.ts rename to dockerfiles/lib/src/api/wsmaster/workspace/workspace-start-event-promise-subscriber.ts diff --git a/dockerfiles/lib-typescript/src/api/wsmaster/workspace/workspace-stop-event-promise-subscriber.ts b/dockerfiles/lib/src/api/wsmaster/workspace/workspace-stop-event-promise-subscriber.ts similarity index 100% rename from dockerfiles/lib-typescript/src/api/wsmaster/workspace/workspace-stop-event-promise-subscriber.ts rename to dockerfiles/lib/src/api/wsmaster/workspace/workspace-stop-event-promise-subscriber.ts diff --git a/dockerfiles/lib-typescript/src/api/wsmaster/workspace/workspace.ts b/dockerfiles/lib/src/api/wsmaster/workspace/workspace.ts similarity index 100% rename from dockerfiles/lib-typescript/src/api/wsmaster/workspace/workspace.ts rename to dockerfiles/lib/src/api/wsmaster/workspace/workspace.ts diff --git a/dockerfiles/lib-typescript/src/index.ts b/dockerfiles/lib/src/index.ts similarity index 100% rename from dockerfiles/lib-typescript/src/index.ts rename to dockerfiles/lib/src/index.ts diff --git a/dockerfiles/lib-typescript/src/internal/action/che-action.ts b/dockerfiles/lib/src/internal/action/che-action.ts similarity index 100% rename from dockerfiles/lib-typescript/src/internal/action/che-action.ts rename to dockerfiles/lib/src/internal/action/che-action.ts diff --git a/dockerfiles/lib-typescript/src/internal/action/impl/add-user-action.ts b/dockerfiles/lib/src/internal/action/impl/add-user-action.ts similarity index 100% rename from dockerfiles/lib-typescript/src/internal/action/impl/add-user-action.ts rename to dockerfiles/lib/src/internal/action/impl/add-user-action.ts diff --git a/dockerfiles/lib-typescript/src/internal/action/impl/create-start-workspace-action.ts b/dockerfiles/lib/src/internal/action/impl/create-start-workspace-action.ts similarity index 100% rename from dockerfiles/lib-typescript/src/internal/action/impl/create-start-workspace-action.ts rename to dockerfiles/lib/src/internal/action/impl/create-start-workspace-action.ts diff --git a/dockerfiles/lib-typescript/src/internal/action/impl/execute-command-action.ts b/dockerfiles/lib/src/internal/action/impl/execute-command-action.ts similarity index 100% rename from dockerfiles/lib-typescript/src/internal/action/impl/execute-command-action.ts rename to dockerfiles/lib/src/internal/action/impl/execute-command-action.ts diff --git a/dockerfiles/lib-typescript/src/internal/action/impl/get-ssh-action.ts b/dockerfiles/lib/src/internal/action/impl/get-ssh-action.ts similarity index 100% rename from dockerfiles/lib-typescript/src/internal/action/impl/get-ssh-action.ts rename to dockerfiles/lib/src/internal/action/impl/get-ssh-action.ts diff --git a/dockerfiles/lib-typescript/src/internal/action/impl/list-workspaces-action.ts b/dockerfiles/lib/src/internal/action/impl/list-workspaces-action.ts similarity index 100% rename from dockerfiles/lib-typescript/src/internal/action/impl/list-workspaces-action.ts rename to dockerfiles/lib/src/internal/action/impl/list-workspaces-action.ts diff --git a/dockerfiles/lib-typescript/src/internal/action/impl/remove-user-action.ts b/dockerfiles/lib/src/internal/action/impl/remove-user-action.ts similarity index 100% rename from dockerfiles/lib-typescript/src/internal/action/impl/remove-user-action.ts rename to dockerfiles/lib/src/internal/action/impl/remove-user-action.ts diff --git a/dockerfiles/lib-typescript/src/internal/action/impl/workspace-ssh-action.ts b/dockerfiles/lib/src/internal/action/impl/workspace-ssh-action.ts similarity index 100% rename from dockerfiles/lib-typescript/src/internal/action/impl/workspace-ssh-action.ts rename to dockerfiles/lib/src/internal/action/impl/workspace-ssh-action.ts diff --git a/dockerfiles/lib-typescript/src/internal/dir/che-dir-constant.properties b/dockerfiles/lib/src/internal/dir/che-dir-constant.properties similarity index 100% rename from dockerfiles/lib-typescript/src/internal/dir/che-dir-constant.properties rename to dockerfiles/lib/src/internal/dir/che-dir-constant.properties diff --git a/dockerfiles/lib-typescript/src/internal/dir/che-dir.ts b/dockerfiles/lib/src/internal/dir/che-dir.ts similarity index 100% rename from dockerfiles/lib-typescript/src/internal/dir/che-dir.ts rename to dockerfiles/lib/src/internal/dir/che-dir.ts diff --git a/dockerfiles/lib-typescript/src/internal/dir/chefile-struct/che-file-struct.ts b/dockerfiles/lib/src/internal/dir/chefile-struct/che-file-struct.ts similarity index 100% rename from dockerfiles/lib-typescript/src/internal/dir/chefile-struct/che-file-struct.ts rename to dockerfiles/lib/src/internal/dir/chefile-struct/che-file-struct.ts diff --git a/dockerfiles/lib-typescript/src/internal/test/che-test.ts b/dockerfiles/lib/src/internal/test/che-test.ts similarity index 100% rename from dockerfiles/lib-typescript/src/internal/test/che-test.ts rename to dockerfiles/lib/src/internal/test/che-test.ts diff --git a/dockerfiles/lib-typescript/src/internal/test/impl/post-flight-check-test.properties b/dockerfiles/lib/src/internal/test/impl/post-flight-check-test.properties similarity index 100% rename from dockerfiles/lib-typescript/src/internal/test/impl/post-flight-check-test.properties rename to dockerfiles/lib/src/internal/test/impl/post-flight-check-test.properties diff --git a/dockerfiles/lib-typescript/src/internal/test/impl/post-flight-check-test.ts b/dockerfiles/lib/src/internal/test/impl/post-flight-check-test.ts similarity index 100% rename from dockerfiles/lib-typescript/src/internal/test/impl/post-flight-check-test.ts rename to dockerfiles/lib/src/internal/test/impl/post-flight-check-test.ts diff --git a/dockerfiles/lib-typescript/src/spi/ascii/ascii-array-info.ts b/dockerfiles/lib/src/spi/ascii/ascii-array-info.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/ascii/ascii-array-info.ts rename to dockerfiles/lib/src/spi/ascii/ascii-array-info.ts diff --git a/dockerfiles/lib-typescript/src/spi/ascii/ascii-array.ts b/dockerfiles/lib/src/spi/ascii/ascii-array.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/ascii/ascii-array.ts rename to dockerfiles/lib/src/spi/ascii/ascii-array.ts diff --git a/dockerfiles/lib-typescript/src/spi/ascii/ascii-form-entry.ts b/dockerfiles/lib/src/spi/ascii/ascii-form-entry.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/ascii/ascii-form-entry.ts rename to dockerfiles/lib/src/spi/ascii/ascii-form-entry.ts diff --git a/dockerfiles/lib-typescript/src/spi/ascii/ascii-form-info.ts b/dockerfiles/lib/src/spi/ascii/ascii-form-info.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/ascii/ascii-form-info.ts rename to dockerfiles/lib/src/spi/ascii/ascii-form-info.ts diff --git a/dockerfiles/lib-typescript/src/spi/ascii/ascii-form.ts b/dockerfiles/lib/src/spi/ascii/ascii-form.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/ascii/ascii-form.ts rename to dockerfiles/lib/src/spi/ascii/ascii-form.ts diff --git a/dockerfiles/lib-typescript/src/spi/ascii/ascii-format.ts b/dockerfiles/lib/src/spi/ascii/ascii-format.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/ascii/ascii-format.ts rename to dockerfiles/lib/src/spi/ascii/ascii-format.ts diff --git a/dockerfiles/lib-typescript/src/spi/ascii/ascii-formatter.ts b/dockerfiles/lib/src/spi/ascii/ascii-formatter.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/ascii/ascii-formatter.ts rename to dockerfiles/lib/src/spi/ascii/ascii-formatter.ts diff --git a/dockerfiles/lib-typescript/src/spi/ascii/csv-formatter.ts b/dockerfiles/lib/src/spi/ascii/csv-formatter.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/ascii/csv-formatter.ts rename to dockerfiles/lib/src/spi/ascii/csv-formatter.ts diff --git a/dockerfiles/lib-typescript/src/spi/ascii/default-ascii-array.spec.ts b/dockerfiles/lib/src/spi/ascii/default-ascii-array.spec.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/ascii/default-ascii-array.spec.ts rename to dockerfiles/lib/src/spi/ascii/default-ascii-array.spec.ts diff --git a/dockerfiles/lib-typescript/src/spi/ascii/default-ascii-array.ts b/dockerfiles/lib/src/spi/ascii/default-ascii-array.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/ascii/default-ascii-array.ts rename to dockerfiles/lib/src/spi/ascii/default-ascii-array.ts diff --git a/dockerfiles/lib-typescript/src/spi/ascii/default-ascii-form.spec.ts b/dockerfiles/lib/src/spi/ascii/default-ascii-form.spec.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/ascii/default-ascii-form.spec.ts rename to dockerfiles/lib/src/spi/ascii/default-ascii-form.spec.ts diff --git a/dockerfiles/lib-typescript/src/spi/ascii/default-ascii-form.ts b/dockerfiles/lib/src/spi/ascii/default-ascii-form.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/ascii/default-ascii-form.ts rename to dockerfiles/lib/src/spi/ascii/default-ascii-form.ts diff --git a/dockerfiles/lib-typescript/src/spi/ascii/formatter-mode.ts b/dockerfiles/lib/src/spi/ascii/formatter-mode.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/ascii/formatter-mode.ts rename to dockerfiles/lib/src/spi/ascii/formatter-mode.ts diff --git a/dockerfiles/lib-typescript/src/spi/ascii/modern-formatter.ts b/dockerfiles/lib/src/spi/ascii/modern-formatter.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/ascii/modern-formatter.ts rename to dockerfiles/lib/src/spi/ascii/modern-formatter.ts diff --git a/dockerfiles/lib-typescript/src/spi/decorator/argument-processor.ts b/dockerfiles/lib/src/spi/decorator/argument-processor.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/decorator/argument-processor.ts rename to dockerfiles/lib/src/spi/decorator/argument-processor.ts diff --git a/dockerfiles/lib-typescript/src/spi/decorator/message.ts b/dockerfiles/lib/src/spi/decorator/message.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/decorator/message.ts rename to dockerfiles/lib/src/spi/decorator/message.ts diff --git a/dockerfiles/lib-typescript/src/spi/decorator/parameter.ts b/dockerfiles/lib/src/spi/decorator/parameter.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/decorator/parameter.ts rename to dockerfiles/lib/src/spi/decorator/parameter.ts diff --git a/dockerfiles/lib-typescript/src/spi/docker/container-version.ts b/dockerfiles/lib/src/spi/docker/container-version.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/docker/container-version.ts rename to dockerfiles/lib/src/spi/docker/container-version.ts diff --git a/dockerfiles/lib-typescript/src/spi/docker/recipebuilder.ts b/dockerfiles/lib/src/spi/docker/recipebuilder.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/docker/recipebuilder.ts rename to dockerfiles/lib/src/spi/docker/recipebuilder.ts diff --git a/dockerfiles/lib-typescript/src/spi/docker/remoteip.ts b/dockerfiles/lib/src/spi/docker/remoteip.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/docker/remoteip.ts rename to dockerfiles/lib/src/spi/docker/remoteip.ts diff --git a/dockerfiles/lib-typescript/src/spi/docker/ssh-generator.ts b/dockerfiles/lib/src/spi/docker/ssh-generator.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/docker/ssh-generator.ts rename to dockerfiles/lib/src/spi/docker/ssh-generator.ts diff --git a/dockerfiles/lib-typescript/src/spi/http/default-http-json-request.ts b/dockerfiles/lib/src/spi/http/default-http-json-request.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/http/default-http-json-request.ts rename to dockerfiles/lib/src/spi/http/default-http-json-request.ts diff --git a/dockerfiles/lib-typescript/src/spi/i18n/i18n.ts b/dockerfiles/lib/src/spi/i18n/i18n.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/i18n/i18n.ts rename to dockerfiles/lib/src/spi/i18n/i18n.ts diff --git a/dockerfiles/lib-typescript/src/spi/index.ts b/dockerfiles/lib/src/spi/index.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/index.ts rename to dockerfiles/lib/src/spi/index.ts diff --git a/dockerfiles/lib-typescript/src/spi/log/log.ts b/dockerfiles/lib/src/spi/log/log.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/log/log.ts rename to dockerfiles/lib/src/spi/log/log.ts diff --git a/dockerfiles/lib-typescript/src/spi/websocket/messagebuilder.ts b/dockerfiles/lib/src/spi/websocket/messagebuilder.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/websocket/messagebuilder.ts rename to dockerfiles/lib/src/spi/websocket/messagebuilder.ts diff --git a/dockerfiles/lib-typescript/src/spi/websocket/messagebus-subscriber.ts b/dockerfiles/lib/src/spi/websocket/messagebus-subscriber.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/websocket/messagebus-subscriber.ts rename to dockerfiles/lib/src/spi/websocket/messagebus-subscriber.ts diff --git a/dockerfiles/lib-typescript/src/spi/websocket/messagebus.ts b/dockerfiles/lib/src/spi/websocket/messagebus.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/websocket/messagebus.ts rename to dockerfiles/lib/src/spi/websocket/messagebus.ts diff --git a/dockerfiles/lib-typescript/src/spi/websocket/websocket.ts b/dockerfiles/lib/src/spi/websocket/websocket.ts similarity index 100% rename from dockerfiles/lib-typescript/src/spi/websocket/websocket.ts rename to dockerfiles/lib/src/spi/websocket/websocket.ts diff --git a/dockerfiles/lib-typescript/src/utils/index.ts b/dockerfiles/lib/src/utils/index.ts similarity index 100% rename from dockerfiles/lib-typescript/src/utils/index.ts rename to dockerfiles/lib/src/utils/index.ts diff --git a/dockerfiles/lib-typescript/src/utils/product-name.ts b/dockerfiles/lib/src/utils/product-name.ts similarity index 100% rename from dockerfiles/lib-typescript/src/utils/product-name.ts rename to dockerfiles/lib/src/utils/product-name.ts diff --git a/dockerfiles/lib-typescript/src/utils/string-utils.spec.ts b/dockerfiles/lib/src/utils/string-utils.spec.ts similarity index 100% rename from dockerfiles/lib-typescript/src/utils/string-utils.spec.ts rename to dockerfiles/lib/src/utils/string-utils.spec.ts diff --git a/dockerfiles/lib-typescript/src/utils/string-utils.ts b/dockerfiles/lib/src/utils/string-utils.ts similarity index 100% rename from dockerfiles/lib-typescript/src/utils/string-utils.ts rename to dockerfiles/lib/src/utils/string-utils.ts diff --git a/dockerfiles/lib-typescript/src/utils/uuid.ts b/dockerfiles/lib/src/utils/uuid.ts similarity index 100% rename from dockerfiles/lib-typescript/src/utils/uuid.ts rename to dockerfiles/lib/src/utils/uuid.ts diff --git a/dockerfiles/lib-typescript/tsconfig.json b/dockerfiles/lib/tsconfig.json similarity index 100% rename from dockerfiles/lib-typescript/tsconfig.json rename to dockerfiles/lib/tsconfig.json diff --git a/dockerfiles/test/Dockerfile b/dockerfiles/test/Dockerfile index 69a1f1e5fb..260b89138c 100644 --- a/dockerfiles/test/Dockerfile +++ b/dockerfiles/test/Dockerfile @@ -10,6 +10,6 @@ # use: # docker run -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-test [command] -FROM eclipse/che-lib-typescript:nightly +FROM eclipse/che-lib:nightly ENTRYPOINT ["node", "/che-lib/index.js", "che-test"]