Skip to content

Commit

Permalink
chore(build): use shared Dockerfile (#581)
Browse files Browse the repository at this point in the history
Co-authored-by: Egor Shamardin <[email protected]>
  • Loading branch information
AsToNlele and LightOfHeaven1994 authored Feb 26, 2025
1 parent e0c79be commit 495f027
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 124 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "build-tools"]
path = build-tools
url = https://github.com/RedHatInsights/insights-frontend-builder-common.git
63 changes: 1 addition & 62 deletions .tekton/dashboard-frontend-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
- name: image-expires-after
value: 5d
- name: dockerfile
value: Dockerfile
value: build-tools/Dockerfile
- name: path-context
value: .
pipelineSpec:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -366,7 +306,6 @@ spec:
value: $(params.build-args-file)
runAfter:
- prefetch-dependencies
- create-frontend-dockerfile
taskRef:
params:
- name: name
Expand Down
63 changes: 1 addition & 62 deletions .tekton/dashboard-frontend-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
- name: output-image
value: quay.io/redhat-user-workloads/insights-management-tenant/insights-dashboard/dashboard-frontend:{{revision}}
- name: dockerfile
value: Dockerfile
value: build-tools/Dockerfile
- name: path-context
value: .
pipelineSpec:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -363,7 +303,6 @@ spec:
value: $(params.build-args-file)
runAfter:
- prefetch-dependencies
- create-frontend-dockerfile
taskRef:
params:
- name: name
Expand Down
1 change: 1 addition & 0 deletions build-tools
Submodule build-tools added at 3161fd

0 comments on commit 495f027

Please sign in to comment.