Skip to content

Commit

Permalink
feat(manager docker) switch to be based on ubi9-minimal (#4244)
Browse files Browse the repository at this point in the history
To achieve OpenShift certification for the Scylla-Operator, our Scylla Manager container images need to be based on Red Hat's UBI images.

Fixes: #4242
  • Loading branch information
yaronkaikov authored Feb 12, 2025
1 parent 86d34f4 commit 59372b6
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 22 deletions.
8 changes: 4 additions & 4 deletions dist/.goreleaser-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ dockers:
- docker/scylla-manager.yaml
- release/
build_flag_templates:
- "--build-arg=ARCH=arm64"
- "--platform=linux/arm64"
- "--build-arg=ARCH=aarch64"
- "--platform=linux/aarch64"

- ids:
use: docker
Expand All @@ -56,8 +56,8 @@ dockers:
- docker/scylla-manager.yaml
- release
build_flag_templates:
- "--build-arg=ARCH=arm64"
- "--platform=linux/arm64"
- "--build-arg=ARCH=aarch64"
- "--platform=linux/aarch64"

docker_manifests:
- id: scylla-manager
Expand Down
16 changes: 7 additions & 9 deletions dist/docker/scylla-manager-agent.dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
FROM ubuntu
ARG ARCH=amd64
FROM docker.io/redhat/ubi9-minimal:latest
ARG ARCH=x86_64

RUN apt-get update && \
apt-get -y upgrade && \
apt-get install -y --no-install-recommends ca-certificates && \
apt-get autoremove -y && \
apt-get clean && \
RUN microdnf update && \
microdnf -y upgrade && \
microdnf install -y ca-certificates && \
rm -rf /var/lib/apt/lists/*

COPY release/scylla-manager-agent*$ARCH.deb /
RUN dpkg -i scylla-manager-agent*$ARCH.deb && rm /scylla-manager-agent*.deb
COPY release/scylla-manager-agent*$ARCH.rpm /
RUN rpm -ivh scylla-manager-agent*$ARCH.rpm && rm /scylla-manager-agent*.rpm

USER scylla-manager
ENV HOME=/var/lib/scylla-manager/
Expand Down
16 changes: 7 additions & 9 deletions dist/docker/scylla-manager.dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
FROM ubuntu
ARG ARCH=amd64
FROM docker.io/redhat/ubi9-minimal:latest
ARG ARCH=x86_64

RUN apt-get update && \
apt-get -y upgrade && \
apt-get install -y --no-install-recommends ca-certificates && \
apt-get autoremove -y && \
apt-get clean && \
RUN microdnf update && \
microdnf -y upgrade && \
microdnf install -y ca-certificates && \
rm -rf /var/lib/apt/lists/*

COPY release/scylla-manager-*$ARCH.deb /
RUN dpkg -i scylla-manager-*$ARCH.deb && rm /scylla-manager-*.deb
COPY release/scylla-manager-*$ARCH.rpm /
RUN rpm -ivh scylla-manager-*$ARCH.rpm && rm /scylla-manager-*.rpm
COPY docker/scylla-manager.yaml /etc/scylla-manager/

USER scylla-manager
Expand Down

0 comments on commit 59372b6

Please sign in to comment.