Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: create a single CLI download image #227

Merged
merged 3 commits into from
Aug 19, 2024

Conversation

lance
Copy link
Member

@lance lance commented Aug 14, 2024

The Konflux team has made changes to the build-source-image task, which previously failed when adding more than just cosign, gitsign and rekor-cli to the image. When we added ec to it, the task began to fail due to an overly large results string, which Konflux could not handle. That limitation in Konflux has been eliminated.

The change in this commit is to create a single CLI download image, which can be used by the operator, instead of the multiple currently in place. Once this change is committed on the main branch, a new component can be created in Konflux to test the build. If it is successful, we can remove the following components from the cli Application in Konflux, and subsequently remove those Dockerfiles from this repo.

The following components can be removed after this build is successful.

  • cli/client-server-cg
  • cli/client-server-ec
  • cli/client-server-f

The Konflux team has made changes to the build-source-image task, which
previously failed when adding more than just cosign, gitsign and
rekor-cli to the image. When we added ec to it, the task began to fail
due to an overly large results string, which Konflux could not handle.
That limitation in Konflux has been eliminated.

The change in this commit is to create a single CLI download image,
which can be used by the operator, instead of the multiple currently in
place. Once this change is committed on the main branch, a new component
can be created in Konflux to test the build. If it is successful, we can
remove the following components from the `cli` Application in Konflux,
and subsequently remove those Dockerfiles from this repo.

The following components can be removed after this build is successful.

* cli/client-server-cg
* cli/client-server-ec
* cli/client-server-f

Signed-off-by: Lance Ball <lball@redhat.com>
@JasonPowr
Copy link

With this are we planning on using this image to server the binary's via Apache? As in adding a web server to this image. Currently we copy these images into a web server via init containers, where as before we had to do this, this image would have included the web server.

If we decide to add the web server to this image, I believe the binary's need to be placed on a specific path to be server correctly "/var/www/html/clients/"

https://github.com/securesign/secure-sign-operator/blob/main/internal/clidownload/component.go#L124-L166

Instead of having the operator provide the httpd server, include it
here to simplify cluster deployment.

Signed-off-by: Lance Ball <lball@redhat.com>
@lance
Copy link
Member Author

lance commented Aug 15, 2024

@JasonPowr I've modified this image to include the httpd server and placed the binaries in /var/www/html. PTAL

Dockerfile.clients.rh Outdated Show resolved Hide resolved
Signed-off-by: Lance Ball <lball@redhat.com>
Copy link

@JasonPowr JasonPowr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm :)

Copy link

openshift-ci bot commented Aug 19, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: JasonPowr, lance

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@JasonPowr JasonPowr merged commit 56fdc0f into main Aug 19, 2024
20 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants