Skip to content

Commit

Permalink
Add independent Dockerfile for GHCR (#17)
Browse files Browse the repository at this point in the history
* Add independent dockerfile for community

* Remove double newlines in dockerfiles
  • Loading branch information
dottorblaster authored Oct 3, 2024
1 parent ba3939f commit ef11a54
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 5 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
29 changes: 29 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]

5 changes: 1 addition & 4 deletions packaging/suse/container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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
Expand All @@ -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"]

0 comments on commit ef11a54

Please sign in to comment.