introduce RC version for pre-release testing (#11477)

* introduce RC version for pre-release testing * move utility images to cli version * use maven central instead of codenvycorp nexus in dev image
eclipse-che · Oct 4, 2018 · b4244e0 · b4244e0
1 parent 969f1d4
commit b4244e0
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 5 deletions.
diff --git a/dockerfiles/base/scripts/base/commands/cmd_offline.sh b/dockerfiles/base/scripts/base/commands/cmd_offline.sh
@@ -40,8 +40,8 @@ post_cmd_offline() {
 cmd_offline() {
   # Read in optional stack images
   readarray -t STACK_IMAGE_LIST < /version/$CHE_VERSION/images-stacks
-  BOOTSTRAP_IMAGE_LIST=$(cat ${SCRIPTS_BASE_CONTAINER_SOURCE_DIR}/images/images-bootstrap)
-  UTILITY_IMAGE_LIST=$(cat ${SCRIPTS_BASE_CONTAINER_SOURCE_DIR}/images/images-utilities)
+  BOOTSTRAP_IMAGE_LIST=$(cat /version/$CHE_VERSION/images-bootstrap)
+  UTILITY_IMAGE_LIST=$(cat /version/$CHE_VERSION/images-utilities)
 
   # List all images to be saved
   if [[ $# -gt 0 ]] && [[ $1 = "--list" ]]; then

diff --git a/dockerfiles/base/scripts/base/startup_03_pre_networking.sh b/dockerfiles/base/scripts/base/startup_03_pre_networking.sh
@@ -90,15 +90,15 @@ get_image_manifest() {
   fi
 
   # Load images from file
-  BOOTSTRAP_IMAGE_LIST=$(cat ${SCRIPTS_BASE_CONTAINER_SOURCE_DIR}/images/images-bootstrap)
+  BOOTSTRAP_IMAGE_LIST=$(cat /version/$1/images-bootstrap)
   IMAGE_LIST=$(cat /version/$1/images)
   if [ -z "${CHE_SINGLE_PORT:-}" ]; then
     IMAGE_LIST=$(echo "${IMAGE_LIST}" | sed '/IMAGE_TRAEFIK/d')
   fi
   if [ -z "${CHE_MULTIUSER:-}" ]; then
      IMAGE_LIST=$(echo "${IMAGE_LIST}" | sed '/IMAGE_KEY*/d; /IMAGE_POSTGRES/d')
   fi
-  UTILITY_IMAGE_LIST=$(cat ${SCRIPTS_BASE_CONTAINER_SOURCE_DIR}/images/images-utilities)
+  UTILITY_IMAGE_LIST=$(cat /version/$1/images-utilities)
 
   # set variables
   set_variables_images_list "${BOOTSTRAP_IMAGE_LIST}"

diff --git a/dockerfiles/cli/version/6.12.0/images-bootstrap b/dockerfiles/cli/version/6.12.0/images-bootstrap
@@ -0,0 +1,2 @@
+BOOTSTRAP_IMAGE_ALPINE=alpine:3.4
+BOOTSTRAP_IMAGE_CHEIP=eclipse/che-ip:6.12.0
diff --git a/dockerfiles/cli/version/6.12.0/images-utilities b/dockerfiles/cli/version/6.12.0/images-utilities
@@ -0,0 +1,4 @@
+UTILITY_IMAGE_CHEACTION=eclipse/che-action:6.12.0
+UTILITY_IMAGE_CHEDIR=eclipse/che-dir:6.12.0
+UTILITY_IMAGE_CHETEST=eclipse/che-test:6.12.0
+UTILITY_IMAGE_CHEMOUNT=eclipse/che-mount:6.12.0
diff --git a/dockerfiles/cli/version/latest/images-bootstrap b/dockerfiles/cli/version/latest/images-bootstrap
@@ -0,0 +1,2 @@
+BOOTSTRAP_IMAGE_ALPINE=alpine:3.4
+BOOTSTRAP_IMAGE_CHEIP=eclipse/che-ip:rc
diff --git a/dockerfiles/cli/version/latest/images-utilities b/dockerfiles/cli/version/latest/images-utilities
@@ -0,0 +1,4 @@
+UTILITY_IMAGE_CHEACTION=eclipse/che-action:rc
+UTILITY_IMAGE_CHEDIR=eclipse/che-dir:rc
+UTILITY_IMAGE_CHETEST=eclipse/che-test:rc
+UTILITY_IMAGE_CHEMOUNT=eclipse/che-mount:rc
diff --git a/...base/scripts/base/images/images-bootstrap → ...iles/cli/version/nightly/images-bootstrap b/...base/scripts/base/images/images-bootstrap → ...iles/cli/version/nightly/images-bootstrap
diff --git a/...base/scripts/base/images/images-utilities → ...iles/cli/version/nightly/images-utilities b/...base/scripts/base/images/images-utilities → ...iles/cli/version/nightly/images-utilities
diff --git a/dockerfiles/cli/version/rc/images b/dockerfiles/cli/version/rc/images
@@ -0,0 +1,6 @@
+IMAGE_INIT=eclipse/che-init:rc
+IMAGE_CHE=eclipse/che-server:rc
+IMAGE_COMPOSE=docker/compose:1.10.1
+IMAGE_TRAEFIK=traefik:v1.5.0
+IMAGE_POSTGRES=centos/postgresql-96-centos7
+IMAGE_KEYCLOACK=jboss/keycloak-openshift:3.4.3.Final
diff --git a/dockerfiles/cli/version/rc/images-bootstrap b/dockerfiles/cli/version/rc/images-bootstrap
@@ -0,0 +1,2 @@
+BOOTSTRAP_IMAGE_ALPINE=alpine:3.4
+BOOTSTRAP_IMAGE_CHEIP=eclipse/che-ip:rc
diff --git a/dockerfiles/cli/version/rc/images-stacks b/dockerfiles/cli/version/rc/images-stacks
@@ -0,0 +1,23 @@
+eclipse/alpine_jdk8
+eclipse/aspnet
+eclipse/centos_jdk8
+eclipse/cpp_gcc
+eclipse/debian_jdk8
+eclipse/debian_jdk8_node
+eclipse/debian_jre
+eclipse/dotnet_core
+eclipse/hadoop-dev
+eclipse/meteor
+eclipse/node
+eclipse/php
+eclipse/platformio
+eclipse/ruby_rails
+eclipse/selenium
+eclipse/ubuntu_android
+eclipse/ubuntu_go
+eclipse/ubuntu_gradle
+eclipse/ubuntu_jdk8
+eclipse/ubuntu_jre
+eclipse/ubuntu_python
+eclipse/ubuntu_wildfly8
+registry.centos.org/che-stacks/vertx
diff --git a/dockerfiles/cli/version/rc/images-utilities b/dockerfiles/cli/version/rc/images-utilities
@@ -0,0 +1,4 @@
+UTILITY_IMAGE_CHEACTION=eclipse/che-action:rc
+UTILITY_IMAGE_CHEDIR=eclipse/che-dir:rc
+UTILITY_IMAGE_CHETEST=eclipse/che-test:rc
+UTILITY_IMAGE_CHEMOUNT=eclipse/che-mount:rc
diff --git a/dockerfiles/dev/Dockerfile b/dockerfiles/dev/Dockerfile
@@ -32,7 +32,7 @@ RUN sudo yum -y update && \
 ENV TOMCAT_VERSION=8.5.23
 
 RUN mkdir $HOME/.m2 && \
-   wget -O  /home/user/tomcat8.zip "http://maven.codenvycorp.com/content/groups/public/org/eclipse/che/lib/che-tomcat8-slf4j-logback/6.0.0-M1/che-tomcat8-slf4j-logback-6.0.0-M1.zip" ;\
+   wget -O  /home/user/tomcat8.zip "https://oss.sonatype.org/content/repositories/releases/org/eclipse/che/lib/che-tomcat8-slf4j-logback/6.11.0/che-tomcat8-slf4j-logback-6.11.0.zip" ;\
    unzip   /home/user/tomcat8.zip -d /home/user/tomcat8;\
    rm /home/user/tomcat8.zip;\
    mkdir /home/user/tomcat8/webapps;\