diff --git a/.tekton/provisioning-frontend-pull-request.yaml b/.tekton/provisioning-frontend-pull-request.yaml index abfdcba6..17cb774d 100644 --- a/.tekton/provisioning-frontend-pull-request.yaml +++ b/.tekton/provisioning-frontend-pull-request.yaml @@ -27,7 +27,7 @@ spec: - name: image-expires-after value: 5d - name: dockerfile - value: Dockerfile + value: deploy/Containerfile - name: path-context value: . pipelineSpec: @@ -214,66 +214,6 @@ spec: workspace: git-auth - name: netrc workspace: netrc - - name: parse-build-deploy-script - params: - - name: path-context - value: $(params.path-context) - taskRef: - resolver: git - params: - - name: url - value: https://github.com/RedHatInsights/konflux-consoledot-frontend-build - - name: revision - value: 2fcdfa9b4858ac941b50ad37317c4f9aaabf91b4 - - name: pathInRepo - value: tasks/parse-build-deploy-script/parse-build-deploy-script.yaml - workspaces: - - name: source - workspace: workspace - runAfter: - - clone-repository - - name: create-frontend-dockerfile - taskRef: - resolver: git - params: - - name: url - value: https://github.com/RedHatInsights/konflux-consoledot-frontend-build - - name: revision - value: 2fcdfa9b4858ac941b50ad37317c4f9aaabf91b4 - - name: pathInRepo - value: tasks/create-frontend-dockerfile/create-frontend-dockerfile.yaml - workspaces: - - name: source - workspace: workspace - params: - - name: path-context - value: $(params.path-context) - - name: component - value: $(tasks.parse-build-deploy-script.results.component) - - name: image - value: $(tasks.parse-build-deploy-script.results.image) - - name: node-build-version - value: $(tasks.parse-build-deploy-script.results.node-build-version) - - name: quay-expire-time - value: $(tasks.parse-build-deploy-script.results.quay-expire-time) - - name: npm-build-script - value: $(tasks.parse-build-deploy-script.results.npm-build-script) - - name: yarn-build-script - value: $(tasks.parse-build-deploy-script.results.yarn-build-script) - - name: route-path - value: $(tasks.parse-build-deploy-script.results.route-path) - - name: beta-route-path - value: $(tasks.parse-build-deploy-script.results.beta-route-path) - - name: preview-route-path - value: $(tasks.parse-build-deploy-script.results.preview-route-path) - - name: ci-root - value: $(tasks.parse-build-deploy-script.results.ci-root) - - name: server-name - value: $(tasks.parse-build-deploy-script.results.server-name) - - name: dist-folder - value: $(tasks.parse-build-deploy-script.results.dist-folder) - runAfter: - - parse-build-deploy-script - name: clone-repository-oci-ta params: - name: url @@ -366,7 +306,6 @@ spec: value: $(params.build-args-file) runAfter: - prefetch-dependencies - - create-frontend-dockerfile taskRef: params: - name: name diff --git a/.tekton/provisioning-frontend-push.yaml b/.tekton/provisioning-frontend-push.yaml index 57ba7c9f..2c16df1d 100644 --- a/.tekton/provisioning-frontend-push.yaml +++ b/.tekton/provisioning-frontend-push.yaml @@ -24,7 +24,7 @@ spec: - name: output-image value: quay.io/redhat-user-workloads/insights-management-tenant/insights-provisioning/provisioning-frontend:{{revision}} - name: dockerfile - value: Dockerfile + value: deploy/Containerfile - name: path-context value: . pipelineSpec: @@ -211,66 +211,6 @@ spec: workspace: git-auth - name: netrc workspace: netrc - - name: parse-build-deploy-script - params: - - name: path-context - value: $(params.path-context) - taskRef: - resolver: git - params: - - name: url - value: https://github.com/RedHatInsights/konflux-consoledot-frontend-build - - name: revision - value: 2fcdfa9b4858ac941b50ad37317c4f9aaabf91b4 - - name: pathInRepo - value: tasks/parse-build-deploy-script/parse-build-deploy-script.yaml - workspaces: - - name: source - workspace: workspace - runAfter: - - clone-repository - - name: create-frontend-dockerfile - taskRef: - resolver: git - params: - - name: url - value: https://github.com/RedHatInsights/konflux-consoledot-frontend-build - - name: revision - value: 2fcdfa9b4858ac941b50ad37317c4f9aaabf91b4 - - name: pathInRepo - value: tasks/create-frontend-dockerfile/create-frontend-dockerfile.yaml - workspaces: - - name: source - workspace: workspace - params: - - name: path-context - value: $(params.path-context) - - name: component - value: $(tasks.parse-build-deploy-script.results.component) - - name: image - value: $(tasks.parse-build-deploy-script.results.image) - - name: node-build-version - value: $(tasks.parse-build-deploy-script.results.node-build-version) - - name: quay-expire-time - value: $(tasks.parse-build-deploy-script.results.quay-expire-time) - - name: npm-build-script - value: $(tasks.parse-build-deploy-script.results.npm-build-script) - - name: yarn-build-script - value: $(tasks.parse-build-deploy-script.results.yarn-build-script) - - name: route-path - value: $(tasks.parse-build-deploy-script.results.route-path) - - name: beta-route-path - value: $(tasks.parse-build-deploy-script.results.beta-route-path) - - name: preview-route-path - value: $(tasks.parse-build-deploy-script.results.preview-route-path) - - name: ci-root - value: $(tasks.parse-build-deploy-script.results.ci-root) - - name: server-name - value: $(tasks.parse-build-deploy-script.results.server-name) - - name: dist-folder - value: $(tasks.parse-build-deploy-script.results.dist-folder) - runAfter: - - parse-build-deploy-script - name: clone-repository-oci-ta params: - name: url @@ -363,7 +303,6 @@ spec: value: $(params.build-args-file) runAfter: - prefetch-dependencies - - create-frontend-dockerfile taskRef: params: - name: name diff --git a/deploy/Containerfile b/deploy/Containerfile new file mode 100644 index 00000000..0b348f5d --- /dev/null +++ b/deploy/Containerfile @@ -0,0 +1,30 @@ +FROM registry.access.redhat.com/ubi9/nodejs-22:9.5-1731603585 as builder + +USER root + +RUN dnf install jq -y + +ADD https://raw.githubusercontent.com/RedHatInsights/insights-frontend-builder-common/refs/heads/master/universal_build.sh \ + https://raw.githubusercontent.com/RedHatInsights/insights-frontend-builder-common/refs/heads/master/build_app_info.sh \ + https://raw.githubusercontent.com/RedHatInsights/insights-frontend-builder-common/refs/heads/master/server_config_gen.sh \ + /opt/app-root/bin/ +RUN chown default /opt/app-root/bin/universal_build.sh /opt/app-root/bin/build_app_info.sh /opt/app-root/bin/server_config_gen.sh; \ + chmod a+x /opt/app-root/bin/universal_build.sh /opt/app-root/bin/build_app_info.sh /opt/app-root/bin/server_config_gen.sh + +USER default + +RUN npm i -g yarn + +COPY --chown=default . . + +RUN universal_build.sh + +FROM quay.io/redhat-services-prod/hcm-eng-prod-tenant/caddy-ubi:0d6954b + +COPY LICENSE /licenses/ + +ENV CADDY_TLS_MODE http_port 8000 + +COPY --from=builder /opt/app-root/src/Caddyfile /etc/caddy/Caddyfile +COPY --from=builder /opt/app-root/src/dist dist +COPY package.json .