CHE-2977 "move the core Che Dockerfiles and Dockerfile.centos into /d…

…ockerfiles/che (eclipse-che#3318)

* CHE-2977 "move the core Che Dockerfiles and Dockerfile.centos into /dockerfiles/che"

merge docker.sh and che.sh.
also docker.sh script is moved from the assembly folder to the docker image folder and named entrypoint.sh

Change-Id: I7404f8f2896e8a7eea83ecab57a6c4c623c68abe
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>

.gitignore

@@ -62,3 +62,4 @@ Thumbs.db
 
 # Che files
 .che
+dockerfiles/che/eclipse-che.tar.gz

assembly/assembly-main/src/assembly/assembly.xml

@@ -192,12 +192,6 @@
         </fileSet>
     </fileSets>
       <files>
-        <file>
-            <source>${project.basedir}/src/assembly/bin/docker.sh</source>
-            <outputDirectory>bin</outputDirectory>
-            <destName>docker.sh</destName>
-            <fileMode>755</fileMode>
-        </file>
         <file>
             <source>${project.basedir}/src/assembly/bin/che.sh</source>
             <outputDirectory>bin</outputDirectory>

Dockerfile → dockerfiles/che/Dockerfile

@@ -9,7 +9,7 @@
 #   Codenvy S.A
 #
 # To build it, run in the repository root:
-#  `docker build -t codenvy/che-server .`
+#  `docker build -t eclipse/che-server .`
 #
 # To run it:
 #  docker run --net=host \
@@ -38,5 +38,6 @@ RUN echo "http://dl-4.alpinelinux.org/alpine/edge/community" >> /etc/apk/reposit
     rm -rf /tmp/* /var/cache/apk/*
 
 EXPOSE 8000 8080
-ADD assembly/assembly-main/target/eclipse-che-*/eclipse-che-* /home/user/che/
-ENTRYPOINT ["/home/user/che/bin/docker.sh"]
+COPY entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+ADD eclipse-che.tar.gz /home/user/

Dockerfile.centos → dockerfiles/che/Dockerfile.centos

@@ -8,7 +8,7 @@
 #   Dharmit Shah  - Initial implementation
 #   Mario Loriedo - Improvements
 #
-# To build it, run in the repository root:
+# To build it, run in the current folder after executing build.sh:
 #  `docker build -t registry.centos.org/eclipse/che-server -f Dockerfile.centos .`
 #
 # To run it:
@@ -34,20 +34,12 @@ RUN yum -y update && \
     curl -sSL "https://${DOCKER_BUCKET}/builds/Linux/x86_64/docker-${DOCKER_VERSION}" -o /usr/bin/docker && \
     chmod +x /usr/bin/docker && \
     yum -y remove openssl && \
-    yum clean all
-RUN useradd user -d /home/user -s /bin/bash -u 1000 -G root && \
-    groupadd docker -g 101 && \
-    usermod -aG ftp,users,docker user && \
+    yum clean all && \
     echo "%root ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
     sed -i 's/Defaults    requiretty/#Defaults    requiretty/g' /etc/sudoers && \
     rm -rf /tmp/* /var/cache/yum
 
 EXPOSE 8000 8080
-
-USER user
-
-ADD assembly/assembly-main/target/eclipse-che-*/eclipse-che-* /home/user/che/
-
-ENTRYPOINT [ "/home/user/che/bin/che.sh", "-c" ]
-
-CMD [ "run" ]
+COPY entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+ADD eclipse-che.tar.gz /home/user/

dockerfiles/che/build.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+# Copyright (c) 2016 Codenvy, S.A.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+
+IMAGE_NAME="eclipse/che-server"
+source $(cd "$(dirname "$0")"; pwd)/../build.include
+
+# grab assembly
+DIR=$(cd "$(dirname "$0")"; pwd)
+if [ ! -d "${DIR}/../../assembly/assembly-main/target" ]; then
+  echo "${ERRO}Have you built assembly/assemby-main in ${DIR}/../assembly/assembly-main 'mvn clean install'?"
+  exit 2
+fi
+
+# Use of folder
+BUILD_ASSEMBLY_ZIP=$(echo ${DIR}/../../assembly/assembly-main/target/eclipse-che-*.tar.gz)
+LOCAL_ASSEMBLY_ZIP=${DIR}/eclipse-che.tar.gz
+
+if [ -f "${LOCAL_ASSEMBLY_ZIP}" ]; then
+  rm ${LOCAL_ASSEMBLY_ZIP}
+fi
+
+echo "Linking assembly ${BUILD_ASSEMBLY_ZIP} --> ${LOCAL_ASSEMBLY_ZIP}"
+ln ${BUILD_ASSEMBLY_ZIP} ${LOCAL_ASSEMBLY_ZIP}
+
+init
+build