diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c9d7fdb..413adcd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -178,7 +178,6 @@ jobs: uses: docker/build-push-action@v6 with: context: . - file: packaging/suse/container/Dockerfile push: true # Will only build if this is not here tags: | ghcr.io/${{ github.repository }}:${{ env.IMAGE_TAG }} diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..84358f8 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,29 @@ +FROM registry.suse.com/bci/bci-base:15.4 + +LABEL org.opencontainers.image.source="https://github.com/trento-project/checks" + +# 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 + +RUN mkdir --mode=0600 /tmp/trento-checks-build + +WORKDIR /tmp/trento-checks-build + +# 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"] + diff --git a/packaging/suse/container/Dockerfile b/packaging/suse/container/Dockerfile index 88c8568..5f15e68 100644 --- a/packaging/suse/container/Dockerfile +++ b/packaging/suse/container/Dockerfile @@ -4,7 +4,7 @@ #!BuildTag: trento/trento-checks:%%VERSION%%-build%RELEASE% #!UseOBSRepositories #!ExclusiveArch: x86_64 -FROM registry.suse.com/bci/bci-base:15.4 +FROM bci/bci-base:15.4 LABEL org.opencontainers.image.source="https://github.com/trento-project/checks" @@ -15,7 +15,6 @@ ENV LC_ALL=C.UTF-8 RUN zypper --non-interactive in -y tar && \ zypper --non-interactive clean - RUN mkdir --mode=0600 /tmp/trento-checks-build WORKDIR /tmp/trento-checks-build @@ -28,11 +27,9 @@ 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"]