Skip to content

Commit e35095b

Browse files
syuu1228Michal-Leszczynski
authored andcommitted
docker: small fix-ups for UBI9 containers (#4335)
Do following fix-ups pointed out on #4280: - Use Red Hat registry for UBI image - Minimize layers - Run cleanup of microdnf fixes #4280 Signed-off-by: Takuya ASADA <[email protected]> (cherry picked from commit bae8518)
1 parent 7aa1cd5 commit e35095b

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

Diff for: dist/docker/scylla-manager-agent.dockerfile

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
FROM docker.io/redhat/ubi9-minimal:latest
1+
FROM registry.access.redhat.com/ubi9-minimal:latest
22
ARG ARCH=x86_64
33

4+
COPY release/scylla-manager-agent*$ARCH.rpm /
5+
COPY license/LICENSE.* /licenses/
6+
47
RUN microdnf -y update && \
58
microdnf -y upgrade && \
69
microdnf install -y ca-certificates && \
7-
rm -rf /var/lib/apt/lists/*
8-
9-
COPY release/scylla-manager-agent*$ARCH.rpm /
10-
RUN rpm -ivh scylla-manager-agent*$ARCH.rpm && rm /scylla-manager-agent*.rpm
11-
COPY license/LICENSE.* /licenses/
10+
microdnf clean all && \
11+
rpm -ivh scylla-manager-agent*$ARCH.rpm && \
12+
rm /scylla-manager-agent*.rpm
1213

1314
USER scylla-manager
1415
ENV HOME=/var/lib/scylla-manager/

Diff for: dist/docker/scylla-manager.dockerfile

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
FROM docker.io/redhat/ubi9-minimal:latest
1+
FROM registry.access.redhat.com/ubi9-minimal:latest
22
ARG ARCH=x86_64
33

4-
RUN microdnf -y update && \
5-
microdnf -y upgrade && \
6-
microdnf install -y ca-certificates && \
7-
rm -rf /var/lib/apt/lists/*
8-
94
COPY release/scylla-manager-*$ARCH.rpm /
10-
RUN rpm -ivh scylla-manager-*$ARCH.rpm && rm /scylla-manager-*.rpm
115
COPY docker/scylla-manager.yaml /etc/scylla-manager/
126
COPY license/LICENSE.* /licenses/
137

8+
RUN microdnf -y update && \
9+
microdnf -y upgrade && \
10+
microdnf install -y ca-certificates && \
11+
microdnf clean all && \
12+
rpm -ivh scylla-manager-*$ARCH.rpm && \
13+
rm /scylla-manager-*.rpm
14+
1415
USER scylla-manager
1516
ENV HOME=/var/lib/scylla-manager/
1617
ENTRYPOINT ["/usr/bin/scylla-manager"]

0 commit comments

Comments
 (0)