Skip to content

Commit

Permalink
Cleanup paths
Browse files Browse the repository at this point in the history
This commit cleans up the paths used during the install. Furthermore it
assumes vendor paths for the checks paths.
  • Loading branch information
janvhs committed Aug 30, 2024
1 parent 819e847 commit bd11029
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 10 deletions.
2 changes: 1 addition & 1 deletion bin/trento-install-checks
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# in regular deployments using docker
#

checks_src="/usr/local/src/trento-checks/checks"
checks_src="/usr/src/trento-checks/checks"
checks_dst="/usr/share/trento/checks"

mkdir -p "$checks_dst"
Expand Down
28 changes: 19 additions & 9 deletions packaging/suse/container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,31 @@ FROM bci/bci-base:15.4

LABEL org.opencontainers.image.source="https://github.com/trento-project/checks"

ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
# If set to C, LC_ALL takes precedence
ENV LC_ALL C.UTF-8

# tar is required by kubectl cp
RUN zypper --non-interactive in -y tar && \
zypper --non-interactive clean

ADD checks.tar.gz /build/

RUN mkdir -p /usr/local/src/trento-checks
RUN mkdir --mode=0600 /tmp/trento-checks-build

RUN mv /build/checks/checks /usr/local/src/trento-checks/checks
WORKDIR /tmp/trento-checks-build

RUN mv /build/checks/bin/trento-install-checks /usr/local/bin/trento-install-checks
RUN chmod +x /usr/local/bin/trento-install-checks
# checks.tar.gz is provided by OBS (build.opensuse.org)
ADD checks.tar.gz .

RUN install --directory --mode=0755 /usr/src/trento-checks
RUN install --directory --mode=0755 /usr/src/trento-checks/checks
RUN install --preserve-timestamps --mode=0644 ./checks/checks/* /usr/src/trento-checks/checks
RUN install --preserve-timestamps --mode=0755 ./checks/bin/trento-install-checks /usr/bin/trento-install-checks


WORKDIR /

RUN rm -r /tmp/trento-checks-build


ENTRYPOINT ["/usr/bin/trento-install-checks"]

ENTRYPOINT ["/usr/local/bin/trento-install-checks"]

0 comments on commit bd11029

Please sign in to comment.