Skip to content

Commit f9b242f

Browse files
authored
Merge pull request #8 from fbladilo/add_tini
Add tini support
2 parents 3b4cf03 + d168b23 commit f9b242f

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
path = hack/build/seed
33
url = https://github.com/konveyor/tackle2-seed
44
branch = main
5+
[submodule "hack/build/tini"]
6+
path = hack/build/tini
7+
url = https://github.com/krallin/tini.git

hack/build/tini

Submodule tini added at de40ad0

konflux.Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,21 @@ RUN make vet && CGO_ENABLED=1 go build -tags json1,strictfipsruntime -o bin/hub
99
# Remove AKS label from Azure target, assumes Azure is the last target listed
1010
RUN sed -i -e '/Azure\ Kubernetes\ Service/,$d' /workspace/hack/build/seed/resources/targets.yaml
1111

12+
# Tini only available in EPEL for now (01/26/2026)
13+
FROM registry.redhat.io/ubi9:latest as tini-builder
14+
COPY --from=builder /workspace/hack/build/tini/ /workspace
15+
RUN dnf install -y cmake make gcc gcc-c++ glibc-static && dnf -y clean all
16+
WORKDIR /workspace
17+
RUN cmake . && make tini && ./tini --version
18+
1219
FROM brew.registry.redhat.io/rh-osbs/mta-mta-static-report-rhel9:8.0.0 as report
1320

1421
FROM registry.redhat.io/ubi9:latest
1522
ARG VERSION=${BUILD_VERSION}
1623
RUN dnf -y install openssl sqlite && dnf -y clean all
1724
RUN echo "hub:x:1001:0:hub:/:/sbin/nologin" >> /etc/passwd
1825

26+
COPY --from=tini-builder /workspace/tini /usr/bin/tini
1927
COPY --from=builder /workspace/bin/hub /usr/local/bin/mta-hub
2028
COPY --from=builder /workspace/internal/auth/roles.yaml /tmp/roles.yaml
2129
COPY --from=builder /workspace/internal/auth/users.yaml /tmp/users.yaml
@@ -25,7 +33,7 @@ COPY --from=report /usr/local/static-report /tmp/analysis/report
2533

2634
RUN echo "${VERSION}" > /etc/hub-build
2735

28-
ENTRYPOINT ["/usr/local/bin/mta-hub"]
36+
ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/tackle-hub"]
2937

3038
LABEL \
3139
description="Migration Toolkit for Applications - Hub" \

0 commit comments

Comments
 (0)