Use docker images instead of maven artifact to deliver che-dashboard …

…&& che-workspace-loader (eclipse-che#16802) Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
xiaochen2050 · May 12, 2020 · f390060 · f390060
1 parent 4f1dcc8
commit f390060
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 155 deletions.
diff --git a/assembly/assembly-dashboard-war/pom.xml b/assembly/assembly-dashboard-war/pom.xml
@@ -29,11 +29,6 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-j2ee</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.dashboard</groupId>
-            <artifactId>che-dashboard-war</artifactId>
-            <type>war</type>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -46,7 +41,6 @@
                         <configuration>
                             <ignoredUnusedDeclaredDependencies>
                                 <dep>org.eclipse.che.core:che-core-commons-j2ee</dep>
-                                <dep>org.eclipse.che.dashboard:che-dashboard-war</dep>
                             </ignoredUnusedDeclaredDependencies>
                         </configuration>
                     </execution>

diff --git a/assembly/assembly-main/pom.xml b/assembly/assembly-main/pom.xml
@@ -12,7 +12,8 @@
       Red Hat, Inc. - initial API and implementation
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>che-assembly-parent</artifactId>
@@ -99,7 +100,21 @@
                                     <artifactId>assembly-che-tomcat8</artifactId>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/dependency</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/dependency/assembly-che-tomcat8</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.eclipse.che</groupId>
+                                    <artifactId>assembly-dashboard-war</artifactId>
+                                    <type>war</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/dependency/assembly-dashboard-war</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.eclipse.che</groupId>
+                                    <artifactId>assembly-workspace-loader-war</artifactId>
+                                    <type>war</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/dependency/assembly-workspace-loader-war</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>

diff --git a/assembly/assembly-main/src/assembly/assembly.xml b/assembly/assembly-main/src/assembly/assembly.xml
@@ -38,24 +38,6 @@
                 <include>org.eclipse.che:assembly-wsmaster-war</include>
             </includes>
         </dependencySet>
-        <dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
-            <unpack>false</unpack>
-            <outputDirectory>tomcat/webapps</outputDirectory>
-            <outputFileNameMapping>dashboard.war</outputFileNameMapping>
-            <includes>
-                <include>org.eclipse.che:assembly-dashboard-war</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
-            <unpack>false</unpack>
-            <outputDirectory>tomcat/webapps</outputDirectory>
-            <outputFileNameMapping>workspace-loader.war</outputFileNameMapping>
-            <includes>
-                <include>org.eclipse.che:assembly-workspace-loader-war</include>
-            </includes>
-        </dependencySet>
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
             <unpack>false</unpack>
@@ -76,12 +58,20 @@
     </dependencySets>
     <fileSets>
         <fileSet>
-            <directory>${project.build.directory}/dependency/</directory>
+            <directory>${project.build.directory}/dependency/assembly-che-tomcat8</directory>
             <outputDirectory>tomcat/</outputDirectory>
             <excludes>
                 <exclude>bin/*.bat</exclude>
             </excludes>
        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/dependency/assembly-dashboard-war</directory>
+            <outputDirectory>tomcat/webapps/dashboard</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/dependency/assembly-workspace-loader-war</directory>
+            <outputDirectory>tomcat/webapps/workspace-loader</outputDirectory>
+        </fileSet>
        <fileSet>
             <directory>${project.basedir}/src/assembly</directory>
             <outputDirectory></outputDirectory>

diff --git a/assembly/assembly-workspace-loader-war/pom.xml b/assembly/assembly-workspace-loader-war/pom.xml
@@ -30,44 +30,5 @@
             <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.workspace.loader</groupId>
-            <artifactId>che-workspace-loader</artifactId>
-            <type>zip</type>
-            <scope>runtime</scope>
-        </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <overlays>
-                        <overlay>
-                            <groupId>org.eclipse.che.workspace.loader</groupId>
-                            <artifactId>che-workspace-loader</artifactId>
-                            <type>zip</type>
-                        </overlay>
-                    </overlays>
-                    <packagingExcludes>/webapp/</packagingExcludes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>analyze</id>
-                        <configuration>
-                            <ignoredUnusedDeclaredDependencies>
-                                <!-- dependency is required just to overlay it's content -->
-                                <dep>org.eclipse.che.workspace.loader:che-workspace-loader</dep>
-                            </ignoredUnusedDeclaredDependencies>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/dockerfiles/che/Dockerfile b/dockerfiles/che/Dockerfile
@@ -5,13 +5,24 @@
 #
 # SPDX-License-Identifier: EPL-2.0
 #
-FROM openjdk:8u242-jre-slim
+
+# Variables in `COPY --from=` is not supported see https://github.com/moby/moby/issues/34482
+# this is workaround to handle that.
+ARG CHE_DASHBOARD_VERSION=next
+ARG CHE_WORKSPACE_LOADER_VERSION=next
+
+FROM quay.io/eclipse/che-dashboard:${CHE_DASHBOARD_VERSION} as che_dashboard_base
+FROM quay.io/eclipse/che-workspace-loader:${CHE_WORKSPACE_LOADER_VERSION} as che_workspace_loader_base
+
+FROM openjdk:8u252-jre-slim
 ENV LANG=C.UTF-8
 RUN echo "%root ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && rm -rf /tmp/*
 EXPOSE 8000 8080
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
 RUN mkdir /logs /data && \
     chmod 0777 /logs /data
+COPY --from=che_dashboard_base /usr/local/apache2/htdocs/dashboard /home/user/eclipse-che/tomcat/webapps/dashboard
+COPY --from=che_workspace_loader_base /usr/local/apache2/htdocs/workspace-loader/ /home/user/eclipse-che/tomcat/webapps/workspace-loader
 ADD eclipse-che /home/user/eclipse-che
 RUN find /home/user -type d -exec chmod 777 {} \;
diff --git a/dockerfiles/che/Dockerfile.centos b/dockerfiles/che/Dockerfile.centos
diff --git a/dockerfiles/che/Dockerfile.openj9 b/dockerfiles/che/Dockerfile.openj9