Adapt to Dashboard replacement

redhat-developer · Jan 14, 2021 · 16f64cf · 16f64cf
1 parent 59eff89
commit 16f64cf
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/dockerfiles/che-fabric8/Dockerfile b/dockerfiles/che-fabric8/Dockerfile
@@ -4,11 +4,9 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ARG CHE_DASHBOARD_VERSION=next
-ARG CHE_DASHBOARD_NEXT_VERSION=next
 ARG CHE_WORKSPACE_LOADER_VERSION=next
 
 FROM quay.io/eclipse/che-dashboard:${CHE_DASHBOARD_VERSION} as che_dashboard_base
-FROM quay.io/che-incubator/che-dashboard-next:${CHE_DASHBOARD_NEXT_VERSION} as che_dashboard_next_base
 FROM quay.io/eclipse/che-workspace-loader:${CHE_WORKSPACE_LOADER_VERSION} as che_workspace_loader_base
 
 
@@ -51,7 +49,6 @@ ENTRYPOINT ["/entrypoint.sh"]
 
 COPY --from=che_workspace_loader_base /usr/local/apache2/htdocs/workspace-loader/ /home/user/eclipse-che/tomcat/webapps/workspace-loader
 COPY --from=che_dashboard_base /usr/local/apache2/htdocs/dashboard /home/user/eclipse-che/tomcat/webapps/dashboard
-COPY --from=che_dashboard_next_base /usr/local/apache2/htdocs/dashboard /home/user/eclipse-che/tomcat/webapps/dashboard/next
 ADD eclipse-che /home/user/eclipse-che
 # Let's apply Hosted Che specific 'product.json' for the dashboard customization
 COPY assets/branding/product.json /home/user/eclipse-che/tomcat/webapps/dashboard/assets/branding/

diff --git a/dockerfiles/che-fabric8/Dockerfile.rhel b/dockerfiles/che-fabric8/Dockerfile.rhel
@@ -6,11 +6,9 @@
 
 # RHEL parent dockerfile: https://github.com/rhdt/EL-Dockerfiles/blob/master/base/rh-che/Dockerfile
 ARG CHE_DASHBOARD_VERSION=next
-ARG CHE_DASHBOARD_NEXT_VERSION=next
 ARG CHE_WORKSPACE_LOADER_VERSION=next
 
 FROM quay.io/eclipse/che-dashboard:${CHE_DASHBOARD_VERSION} as che_dashboard_base
-FROM quay.io/che-incubator/che-dashboard-next:${CHE_DASHBOARD_NEXT_VERSION} as che_dashboard_next_base
 FROM quay.io/eclipse/che-workspace-loader:${CHE_WORKSPACE_LOADER_VERSION} as che_workspace_loader_base
 
 
@@ -36,7 +34,6 @@ ENTRYPOINT ["/entrypoint.sh"]
 
 COPY --from=che_workspace_loader_base /usr/local/apache2/htdocs/workspace-loader/ /home/user/eclipse-che/tomcat/webapps/workspace-loader
 COPY --from=che_dashboard_base /usr/local/apache2/htdocs/dashboard /home/user/eclipse-che/tomcat/webapps/dashboard
-COPY --from=che_dashboard_next_base /usr/local/apache2/htdocs/dashboard /home/user/eclipse-che/tomcat/webapps/dashboard/next
 ADD eclipse-che /home/user/eclipse-che
 # Let's apply Hosted Che specific 'product.json' for the dashboard customization
 COPY assets/branding/product.json /home/user/eclipse-che/tomcat/webapps/dashboard/assets/branding/

diff --git a/dockerfiles/che-fabric8/assets/branding/product.json b/dockerfiles/che-fabric8/assets/branding/product.json
@@ -5,12 +5,6 @@
     "faq": "https://www.eclipse.org/che/docs/che-7/hosted-che/#hosted-che-faq-and-troubleshooting_hosted-che"
   },
   "configuration": {
-    "menu": {
-      "disabled": ["organizations", "factories"]
-    }, 
-    "features": {
-      "disabled": ["workspaceSharing", "kubernetesNamespaceSelector"]
-    },
     "prefetch": {
       "cheCDN":"/api/cdn-support/paths"
     }