Skip to content

Commit fa0632a

Browse files
rubenperezmrdimaio
authored andcommitted
fix(docker): add dnf cache clean commands in Dockerfiles #414
1 parent fa71361 commit fa0632a

File tree

8 files changed

+40
-19
lines changed

8 files changed

+40
-19
lines changed

clients/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ RUN if [ -n "$POLICY_PACKAGE_REQUIREMENTS" ]; then \
5555
done; \
5656
dnf remove -y git && \
5757
dnf autoremove && \
58-
dnf clean all; \
58+
dnf clean all && \
59+
rm -rf /var/cache/dnf; \
5960
fi
6061
USER ${USER}
6162

daemons/Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ ARG TARGETARCH
3939
RUN if [ $TARGETARCH = "arm64" ]; then \
4040
dnf install -y \
4141
gcc \
42-
python3-devel \
43-
; fi
42+
python3-devel && \
43+
dnf clean all && \
44+
rm -rf /var/cache/dnf; \
45+
fi
4446

4547
RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \
4648
echo "/usr/lib/oracle/19/client64/lib" >/etc/ld.so.conf.d/oracle.conf; \
@@ -71,7 +73,8 @@ RUN if [ -n "$POLICY_PACKAGE_REQUIREMENTS" ]; then \
7173
done; \
7274
dnf remove -y git && \
7375
dnf autoremove && \
74-
dnf clean all; \
76+
dnf clean all && \
77+
rm -rf /var/cache/dnf; \
7578
fi
7679
USER ${USER}
7780

fs/Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@ ARG TAG
22
FROM rucio/rucio-clients:release-$TAG
33

44
USER root
5-
RUN dnf install -y git cmake3 libcurl-devel fuse-devel tree g++
5+
RUN dnf -y install \
6+
git \
7+
cmake3 \
8+
libcurl-devel \
9+
fuse-devel \
10+
tree \
11+
g++ && \
12+
dnf clean all && \
13+
rm -rf /var/cache/dnf
614

715
ENV HOME=/opt/app-root/src \
816
PATH=/opt/app-root/src/bin:/opt/app-root/bin:/opt/rh/devtoolset-9/root/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

fts-cron/Dockerfile_cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ RUN chmod +x /usr/bin/kubectl
2727
RUN dnf -y install ca-certificates.noarch ca-policy-lcg fetch-crl voms-clients-cpp fts-rest-cli \
2828
wlcg-iam-lsc-atlas wlcg-iam-vomses-atlas wlcg-iam-lsc-cms wlcg-iam-vomses-cms \
2929
python-setuptools python-requests && \
30-
yum clean all && \
31-
rm -rf /var/cache/yum
30+
dnf clean all && \
31+
rm -rf /var/cache/dnf
3232

3333
# Install wget
3434
RUN yum -y install wget && \

init/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ RUN if [ -n "$POLICY_PACKAGE_REQUIREMENTS" ]; then \
4444
done; \
4545
dnf remove -y git && \
4646
dnf autoremove && \
47-
dnf clean all; \
47+
dnf clean all && \
48+
rm -rf /var/cache/dnf; \
4849
fi
4950
USER ${USER}
5051

server/Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ ARG TARGETARCH
3030
RUN if [ $TARGETARCH = "arm64" ]; then \
3131
dnf install -y \
3232
gcc \
33-
python3-devel \
34-
; fi
33+
python3-devel && \
34+
dnf clean all && \
35+
rm -rf /var/cache/dnf; \
36+
fi
3537

3638

3739
RUN rpm -i https://download.oracle.com/otn_software/linux/instantclient/1912000/oracle-instantclient19.12-basiclite-19.12.0.0.0-1.x86_64.rpm; \
@@ -75,7 +77,8 @@ RUN if [ -n "$POLICY_PACKAGE_REQUIREMENTS" ]; then \
7577
done; \
7678
dnf remove -y git && \
7779
dnf autoremove && \
78-
dnf clean all; \
80+
dnf clean all && \
81+
rm -rf /var/cache/dnf; \
7982
fi
8083
USER ${USER}
8184

test-fts/Dockerfile

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ FROM almalinux:9
33
# Enable EPEL
44
RUN dnf install -y yum-utils \
55
&& dnf config-manager --set-enabled crb \
6-
&& dnf install -y epel-release
6+
&& dnf install -y epel-release \
7+
&& dnf clean all \
8+
&& rm -rf /var/cache/dnf
79

810

911
# Install FTS
@@ -14,12 +16,14 @@ RUN curl -sSfL -o /etc/yum.repos.d/fts3.repo https://fts-repo.web.cern.ch/fts-re
1416
&& curl -sSfL -o /etc/yum.repos.d/dmc.repo https://dmc-repo.web.cern.ch/dmc-repo/dmc-el9.repo
1517

1618
RUN dnf install -y \
17-
fts-server fts-mysql fts-rest-client fts-rest-server fts-monitoring \
18-
fts-server-selinux fts-rest-server-selinux fts-monitoring-selinux \
19-
fts-msg \
20-
mysql \
21-
multitail \
22-
gfal2-plugin*
19+
fts-server fts-mysql fts-rest-client fts-rest-server fts-monitoring \
20+
fts-server-selinux fts-rest-server-selinux fts-monitoring-selinux \
21+
fts-msg \
22+
mysql \
23+
multitail \
24+
gfal2-plugin* \
25+
&& dnf clean all \
26+
&& rm -rf /var/cache/dnf
2327

2428

2529
COPY fts3config /etc/fts3/fts3config

ui/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ RUN if [ -n "$POLICY_PACKAGE_REQUIREMENTS" ]; then \
6666
done; \
6767
dnf remove -y git && \
6868
dnf autoremove && \
69-
dnf clean all; \
69+
dnf clean all && \
70+
rm -rf /var/cache/dnf; \
7071
fi
7172
USER ${USER}
7273

0 commit comments

Comments
 (0)