Skip to content
This repository was archived by the owner on Mar 21, 2025. It is now read-only.

Commit f502d16

Browse files
author
Michael Sauter
committed
Fix various smaller errors due to refactoring
1 parent d00f31b commit f502d16

File tree

5 files changed

+6
-153
lines changed

5 files changed

+6
-153
lines changed

.github/workflows/release.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@ jobs:
2828
strategy:
2929
fail-fast: true
3030
matrix:
31-
image: ["aqua-scan", "finish", "go-toolset", "gradle-toolset", "helm", "node16-npm-toolset", "node18-npm-toolset", "package-image", "pipeline-manager", "python-toolset", "sonar", "start"]
31+
image: ["finish", "pipeline-manager", "start"]
3232
permissions:
3333
contents: read
3434
packages: write
3535
id-token: write
36-
3736
steps:
3837
- name: Checkout
3938
uses: actions/checkout@v4
@@ -58,9 +57,9 @@ jobs:
5857
uses: docker/build-push-action@v3
5958
with:
6059
context: .
61-
file: build/package/Dockerfile.${{ matrix.image }}
60+
file: build/images/Dockerfile.${{ matrix.image }}
6261
push: true
63-
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_BASE }}/ods-${{ matrix.image }}:${{ needs.setup.outputs.imageTag }}
62+
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_BASE }}/${{ matrix.image }}:${{ needs.setup.outputs.imageTag }}
6463

6564
release-chart:
6665
runs-on: ubuntu-latest

deploy/chart/templates/task-finish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
default: ''
2020
steps:
2121
- name: finish
22-
# Image is built from build/package/Dockerfile.finish.
22+
# Image is built from build/images/Dockerfile.finish.
2323
image: '{{.Values.imageRepository}}/finish:{{.Values.imageTag | default .Chart.AppVersion}}'
2424
env:
2525
- name: HOME

deploy/chart/templates/task-start.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ spec:
7575
name: url
7676
steps:
7777
- name: start
78-
# Image is built from build/package/Dockerfile.start.
78+
# Image is built from build/images/Dockerfile.start.
7979
image: '{{.Values.imageRepository}}/start:{{.Values.imageTag | default .Chart.AppVersion}}'
8080
env:
8181
- name: HOME

docs/repository-layout.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The most important pieces are:
66

77
* **build/images**: `Dockerfile`s for the various container images in use. These images back Tekton tasks or the pipeline manager.
88
* **cmd**: Main executables. These are installed (in different combinations) into the container images.
9-
* **deploy**: OpenShift/K8S resource definitions, such as `Task` resources. The tasks make use of the images built via `build/package` and released to ghcr.io. Their `script` calls an executables built from the `cmd` folder.
9+
* **deploy**: OpenShift/K8S resource definitions, such as `Task` resources. The tasks make use of the images built via `build/images` and released to ghcr.io. Their `script` calls an executables built from the `cmd` folder.
1010
* **docs**: Design and user documents
1111
* **internal/manager**: Implementation of the webhook receiver and pipeline manager - it creates and modifies the actual Tekton pipelines on the fly based on the config found in the repository triggering the webhook request.
1212
* **pkg**: Packages shared by the various main executables and the pipeline manager. These packages are the public interface and may be used outside this repo (e.g. by custom tasks). Example of packages are `bitbucket` (a Bitbucket Server API v1.0 client), `sonar` (a SonarQube client exposing API endpoints, scanner CLI and report CLI in one unified interface), `nexus` (a Nexus client for uploading, downloading and searching for assets) and `config` (the ODS configuration specification).

test/scripts/download-aqua-scanner_test.go

Lines changed: 0 additions & 146 deletions
This file was deleted.

0 commit comments

Comments
 (0)