Skip to content

Commit 150e61e

Browse files
Rakshitha-KamathRakshitha-Kamath
authored andcommitted
promtail-8.1: Build promtail for multi-arch
Signed-off-by: Rakshitha-Kamath <[email protected]>
1 parent 57c3fc4 commit 150e61e

File tree

4 files changed

+59
-8
lines changed

4 files changed

+59
-8
lines changed

.tekton/promtail-8-1-pull-request.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ spec:
3030
- name: build-platforms
3131
value:
3232
- linux/x86_64
33+
- linux/arm64
34+
- linux/s390x
35+
- linux/ppc64le
3336
- name: dockerfile
3437
value: Dockerfile
3538
- name: path-context

.tekton/promtail-8-1-push.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ spec:
2727
- name: build-platforms
2828
value:
2929
- linux/x86_64
30+
- linux/arm64
31+
- linux/s390x
32+
- linux/ppc64le
3033
- name: dockerfile
3134
value: Dockerfile
3235
- name: path-context

Dockerfile

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,31 @@
1-
#FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.21 AS builder
2-
FROM quay.io/projectquay/golang:1.24 AS builder
3-
COPY loki loki
4-
WORKDIR loki
1+
ARG REMOTE_SOURCE=loki
2+
ARG REMOTE_SOURCE_DIR=/go/app
3+
4+
FROM --platform=$BUILDPLATFORM quay.io/projectquay/golang:1.23 AS builder
5+
6+
# Build Arguments
7+
ARG REMOTE_SOURCE
8+
ARG REMOTE_SOURCE_DIR
9+
10+
COPY $REMOTE_SOURCE $REMOTE_SOURCE_DIR
11+
WORKDIR $REMOTE_SOURCE_DIR
512
RUN make clean && make BUILD_IN_CONTAINER=false promtail
613

714

8-
FROM registry.redhat.io/ubi9/ubi-micro
9-
# Standard Red Hat labels
15+
FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9-minimal:latest
16+
17+
# Build Arguments
18+
ARG REMOTE_SOURCE
19+
ARG REMOTE_SOURCE_DIR
20+
1021
LABEL com.redhat.component="promtail-container"
1122
LABEL name="promtail"
1223
LABEL version="v3.0.0"
1324
LABEL summary="Provides promtail container"
1425
LABEL io.k8s.display-name="Promtail container"
1526
LABEL maintainer="Guillaume Abrioux <[email protected]>"
1627
LABEL description="Responsible for gathering logs and sending them to Loki"
17-
COPY --from=builder go/loki/clients/cmd/promtail/promtail /usr/bin/promtail
18-
COPY --from=builder go/loki/clients/cmd/promtail/promtail-docker-config.yaml /etc/promtail/config.yml
28+
COPY --from=builder $REMOTE_SOURCE_DIR/clients/cmd/promtail/promtail /usr/bin/promtail
29+
COPY --from=builder $REMOTE_SOURCE_DIR/clients/cmd/promtail/promtail-docker-config.yaml /etc/promtail/config.yml
1930
ENTRYPOINT ["/usr/bin/promtail"]
2031
CMD ["-config.file=/etc/promtail/config.yml"]

pipelines/jenkins.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
kind: Pipeline
2+
apiVersion: tekton.dev/v1beta1
3+
metadata:
4+
name: my-jenkins-trigger
5+
spec:
6+
params:
7+
- name: JENKINS_HOST_URL
8+
type: string
9+
- name: JOB_NAME
10+
type: string
11+
- description: 'Snapshot of the konflux application'
12+
name: SNAPSHOT
13+
type: string
14+
tasks:
15+
- name: trigger-jenkins-job
16+
taskRef:
17+
resolver: "git"
18+
params:
19+
- name: url
20+
value: https://github.com/konflux-ci/tekton-integration-catalog.git
21+
- name: revision
22+
value: main
23+
- name: pathInRepo
24+
value: tasks/triggers/jenkins/0.1/trigger-jenkins-job.yaml
25+
params:
26+
- name: JENKINS_HOST_URL
27+
value: $(params.JENKINS_HOST_URL)
28+
- name: JOB_NAME
29+
value: $(params.JOB_NAME)
30+
- name: JENKINS_SECRETS
31+
value: my-jenkins-credentials
32+
- name: JOB_PARAMS
33+
value:
34+
- KONFLUX_SNAPSHOT=$(params.SNAPSHOT)

0 commit comments

Comments
 (0)