Move dockerfiles to build/dockerfiles

.github/workflows/build-pr-check.yml

@@ -47,7 +47,7 @@ jobs:
       run: mvn -B clean install -U -Pintegration
     - name: Build docker images
       if: github.event_name == 'pull_request'
-      run: ./dockerfiles/build.sh --tag:${{ env.PR_IMAGE_TAG }}
+      run: ./build/build.sh --tag:${{ env.PR_IMAGE_TAG }}
     - name: Push docker images
       if: github.event_name == 'pull_request'
       run: docker push quay.io/eclipse/che-server:${{ env.PR_IMAGE_TAG }}

.github/workflows/next-build.yml

@@ -46,18 +46,9 @@ jobs:
       id: build
       run: |
           echo "short_sha1=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-          ./dockerfiles/build.sh --tag:next --sha-tag
+          ./build/build.sh --tag:next --sha-tag
     - name: Push docker images
       run: |
-        docker push quay.io/eclipse/che-endpoint-watcher:next
-        docker push quay.io/eclipse/che-endpoint-watcher:${{ steps.build.outputs.short_sha1 }}
-
-        docker push quay.io/eclipse/che-keycloak:next
-        docker push quay.io/eclipse/che-keycloak:${{ steps.build.outputs.short_sha1 }}
-
-        docker push quay.io/eclipse/che-postgres:next
-        docker push quay.io/eclipse/che-postgres:${{ steps.build.outputs.short_sha1 }}
-
         docker push quay.io/eclipse/che-server:next
         docker push quay.io/eclipse/che-server:${{ steps.build.outputs.short_sha1 }}
     - name: Create failure MM message

dockerfiles/build.include → build/build.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
-# Copyright (c) 2017 Red Hat, Inc.
+#
+# Copyright (c) 2017-2023 Red Hat, Inc.
 # This program and the accompanying materials are made
 # available under the terms of the Eclipse Public License 2.0
 # which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -151,7 +152,7 @@ build_image() {
       else
         printf "${RED}Failure when tagging docker image ${SHA_IMAGE_NAME}${NC}\n"
         exit 1
-      fi      
+      fi
     fi
     if [ ! -z "${IMAGE_ALIASES}" ]; then
       for TMP_IMAGE_NAME in ${IMAGE_ALIASES}
@@ -227,3 +228,27 @@ get_mount_path() {
   CLEAN_PATH=$(get_clean_path "${POSIX_PATH}")
   echo $CLEAN_PATH
 }
+
+# grab assembly
+DIR="$(cd "$(dirname "$0")"; pwd)/dockerfiles"
+if [ ! -d "${DIR}/../../assembly/assembly-main/target" ]; then
+  echo "${ERROR}Have you built assembly/assemby-main in ${DIR}/../assembly/assembly-main 'mvn clean install'?"
+  exit 2
+fi
+
+# Use of folder
+BUILD_ASSEMBLY_DIR=$(echo "${DIR}"/../../assembly/assembly-main/target/eclipse-che-*/eclipse-che-*/)
+LOCAL_ASSEMBLY_DIR="${DIR}"/eclipse-che
+
+if [ -d "${LOCAL_ASSEMBLY_DIR}" ]; then
+  rm -r "${LOCAL_ASSEMBLY_DIR}"
+fi
+
+echo "Copying assembly ${BUILD_ASSEMBLY_DIR} --> ${LOCAL_ASSEMBLY_DIR}"
+cp -r "${BUILD_ASSEMBLY_DIR}" "${LOCAL_ASSEMBLY_DIR}"
+
+init --name:server "$@"
+build
+
+#cleanUp
+rm -rf ${DIR}/eclipse-che

build/dockerfiles/brew.Dockerfile

@@ -0,0 +1,40 @@
+# Copyright (c) 2018-2023 Red Hat, Inc.
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#   Red Hat, Inc. - initial API and implementation
+#
+
+# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal
+FROM ubi8-minimal:8.7-1085
+USER root
+ENV CHE_HOME=/home/user/devspaces
+ENV JAVA_HOME=/usr/lib/jvm/jre
+RUN microdnf install java-11-openjdk-headless tar gzip shadow-utils findutils && \
+    microdnf update -y && \
+    microdnf -y clean all && rm -rf /var/cache/yum && echo "Installed Packages" && rpm -qa | sort -V && echo "End Of Installed Packages" && \
+    adduser -G root user && mkdir -p /home/user/devspaces
+COPY entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+
+# see fetch-artifacts-pnc.yaml
+COPY artifacts/assembly-main.tar.gz /tmp/assembly-main.tar.gz
+RUN tar xzf /tmp/assembly-main.tar.gz --strip-components=1 -C /home/user/devspaces; rm -f /tmp/assembly-main.tar.gz
+
+# this should fail if the startup script is not found in correct path /home/user/devspaces/tomcat/bin/catalina.sh
+RUN mkdir /logs /data && \
+    chmod 0777 /logs /data && \
+    chgrp -R 0 /home/user /logs /data && \
+    chown -R user /home/user && \
+    chmod -R g+rwX /home/user && \
+    find /home/user -type d -exec chmod 777 {} \; && \
+    java -version && echo -n "Server startup script in: " && \
+    find /home/user/devspaces -name catalina.sh | grep -z /home/user/devspaces/tomcat/bin/catalina.sh
+
+USER user
+
+# append Brew metadata here