Skip to content

Fix: Modify Dockerfile and Tekton task to support new changes #181

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.

Sign up for GitHub

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

Merged
lbroudoux merged 1 commit into from
Sep 8, 2025
Merged

Fix: Modify Dockerfile and Tekton task to support new changes #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ WORKDIR /app
ARG TARGETOS
ARG TARGETARCH
RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
go build -ldflags="-s -w" -o microcks-cli github.com/microcks/microcks-cli
go build -ldflags="-s -w" -o microcks github.com/microcks/microcks-cli

# Build image
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5-1742914212
Expand All @@ -19,12 +19,12 @@ LABEL maintainer="Laurent Broudoux <laurent@microcks.io>" \
org.opencontainers.image.documentation="https://github.com/microcks/microcks-cli" \
io.artifacthub.package.readme-url="https://raw.githubusercontent.com/microcks/microcks-cli/master/README.md"

ENV CLI=/usr/local/bin/microcks-cli \
ENV CLI=/usr/local/bin/microcks \
USER_UID=1001 \
USER_NAME=microcks-cli

# install cli binary
COPY --from=build-env /app/microcks-cli ${CLI}
COPY --from=build-env /app/microcks ${CLI}

COPY build/bin /usr/local/bin
RUN /usr/local/bin/user_setup
Expand Down
4 changes: 2 additions & 2 deletions tekton/microcks-import-task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ spec:
args:
- '-c'
- >-
microcks-cli import '$(params.specificationFilesList)' \
microcks import '$(params.specificationFilesList)' \
--microcksURL=$(params.microcksURL) \
--keycloakClientId=$KEYCLOAK_CLIENT_ID --keycloakClientSecret=$KEYCLOAK_CLIENT_SECRET \
--insecure'
--insecure-tls
env:
- name: KEYCLOAK_CLIENT_ID
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion tekton/microcks-test-customcerts-task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
args:
- '-c'
- >-
microcks-cli test '$(params.apiNameAndVersion)' $(params.testEndpoint) $(params.runner) \
microcks test '$(params.apiNameAndVersion)' $(params.testEndpoint) $(params.runner) \
--microcksURL=$(params.microcksURL) --waitFor=$(params.waitFor) \
--keycloakClientId=$(params.keycloakClientId) --keycloakClientSecret=$(params.keycloakClientSecret) \
--caCerts=/var/run/secrets/customcerts/ca.crt --filteredOperations='$(params.filteredOperations)' --operationsHeaders='$(params.operationsHeaders)'
Expand Down
4 changes: 2 additions & 2 deletions tekton/microcks-test-task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ spec:
args:
- '-c'
- >-
microcks-cli test '$(params.apiNameAndVersion)' $(params.testEndpoint) $(params.runner) \
microcks test '$(params.apiNameAndVersion)' $(params.testEndpoint) $(params.runner) \
--microcksURL=$(params.microcksURL) --waitFor=$(params.waitFor) --secretName='$(params.secretName)' \
--keycloakClientId=$KEYCLOAK_CLIENT_ID --keycloakClientSecret=$KEYCLOAK_CLIENT_SECRET \
--insecure --operationsHeaders='$(params.operationsHeaders)'
--insecure-tls --operationsHeaders='$(params.operationsHeaders)'
env:
- name: KEYCLOAK_CLIENT_ID
valueFrom:
Expand Down
4 changes: 2 additions & 2 deletions tekton/microcks-test-with-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ spec:
args:
- '-c'
- >-
microcks-cli test '$(params.apiNameAndVersion)' $(params.testEndpoint) $(params.runner) \
microcks test '$(params.apiNameAndVersion)' $(params.testEndpoint) $(params.runner) \
--microcksURL=$(params.microcksURL) --waitFor=$(params.waitFor) --secretName='$(params.secretName)' \
--keycloakClientId=$KEYCLOAK_CLIENT_ID --keycloakClientSecret=$KEYCLOAK_CLIENT_SECRET \
--insecure --operationsHeaders='$(params.operationsHeaders)'
--insecure-tls --operationsHeaders='$(params.operationsHeaders)'
env:
- name: KEYCLOAK_CLIENT_ID
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion tekton/v1alpha1/microcks-test-customcerts-task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
args:
- '-c'
- >-
microcks-cli test '$(inputs.params.apiNameAndVersion)' $(inputs.params.testEndpoint) $(inputs.params.runner) \
microcks test '$(inputs.params.apiNameAndVersion)' $(inputs.params.testEndpoint) $(inputs.params.runner) \
--microcksURL=$(inputs.params.microcksURL) --waitFor=$(inputs.params.waitFor) \
--keycloakClientId=$(inputs.params.keycloakClientId) --keycloakClientSecret=$(inputs.params.keycloakClientSecret) \
--caCerts=/var/run/secrets/customcerts/ca.crt --operationsHeaders='$(inputs.params.operationsHeaders)'
Expand Down
4 changes: 2 additions & 2 deletions tekton/v1alpha1/microcks-test-task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
args:
- '-c'
- >-
microcks-cli test '$(inputs.params.apiNameAndVersion)' $(inputs.params.testEndpoint) $(inputs.params.runner) \
microcks test '$(inputs.params.apiNameAndVersion)' $(inputs.params.testEndpoint) $(inputs.params.runner) \
--microcksURL=$(inputs.params.microcksURL) --waitFor=$(inputs.params.waitFor) \
--keycloakClientId=$(inputs.params.keycloakClientId) --keycloakClientSecret=$(inputs.params.keycloakClientSecret) \
--insecure --operationsHeaders='$(inputs.params.operationsHeaders)'
--insecure-tls --operationsHeaders='$(inputs.params.operationsHeaders)'