Skip to content

Commit 105a57a

Browse files
rdimaiobari12
authored andcommitted
server,clients,daemons,ui,init: add policy package build arg support; fix rucio#364
1 parent e165dd9 commit 105a57a

File tree

5 files changed

+70
-0
lines changed

5 files changed

+70
-0
lines changed

clients/Dockerfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,19 @@ ADD --chown=user;user ./entrypoint.sh /opt/user/entrypoint.sh
4545

4646
ENV PATH $PATH:/opt/rucio/bin
4747

48+
ARG POLICY_PACKAGE_REQUIREMENTS
49+
ARG USER=root
50+
USER root
51+
RUN if [ -n "$POLICY_PACKAGE_REQUIREMENTS" ]; then \
52+
dnf install -y git && \
53+
for package in $(echo $POLICY_PACKAGE_REQUIREMENTS | tr "," "\n"); do \
54+
python3 -m pip install --no-cache-dir $package; \
55+
done; \
56+
dnf remove -y git && \
57+
dnf autoremove && \
58+
dnf clean all; \
59+
fi
60+
USER ${USER}
61+
4862
ENTRYPOINT ["/opt/user/entrypoint.sh"]
4963
CMD ["bash"]

daemons/Dockerfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,18 @@ VOLUME /opt/rucio/etc
6363

6464
ENV USE_DAVIX_WITH_OPENSSL31=True
6565

66+
ARG POLICY_PACKAGE_REQUIREMENTS
67+
ARG USER=root
68+
USER root
69+
RUN if [ -n "$POLICY_PACKAGE_REQUIREMENTS" ]; then \
70+
dnf install -y git && \
71+
for package in $(echo $POLICY_PACKAGE_REQUIREMENTS | tr "," "\n"); do \
72+
python3 -m pip install --no-cache-dir $package; \
73+
done; \
74+
dnf remove -y git && \
75+
dnf autoremove && \
76+
dnf clean all; \
77+
fi
78+
USER ${USER}
79+
6680
ENTRYPOINT ["/start-daemon.sh"]

init/Dockerfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,18 @@ COPY alembic.ini.j2 /tmp
3434
COPY bootstrap.py /tmp
3535
COPY docker-entrypoint.sh /
3636

37+
ARG POLICY_PACKAGE_REQUIREMENTS
38+
ARG USER=root
39+
USER root
40+
RUN if [ -n "$POLICY_PACKAGE_REQUIREMENTS" ]; then \
41+
dnf install -y git && \
42+
for package in $(echo $POLICY_PACKAGE_REQUIREMENTS | tr "," "\n"); do \
43+
python3 -m pip install --no-cache-dir $package; \
44+
done; \
45+
dnf remove -y git && \
46+
dnf autoremove && \
47+
dnf clean all; \
48+
fi
49+
USER ${USER}
50+
3751
CMD ["/docker-entrypoint.sh"]

server/Dockerfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,18 @@ VOLUME /opt/rucio/etc
6565
EXPOSE 80
6666
EXPOSE 443
6767

68+
ARG POLICY_PACKAGE_REQUIREMENTS
69+
ARG USER=root
70+
USER root
71+
RUN if [ -n "$POLICY_PACKAGE_REQUIREMENTS" ]; then \
72+
dnf install -y git && \
73+
for package in $(echo $POLICY_PACKAGE_REQUIREMENTS | tr "," "\n"); do \
74+
python3 -m pip install --no-cache-dir $package; \
75+
done; \
76+
dnf remove -y git && \
77+
dnf autoremove && \
78+
dnf clean all; \
79+
fi
80+
USER ${USER}
81+
6882
ENTRYPOINT ["/docker-entrypoint.sh"]

ui/Dockerfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,18 @@ VOLUME /opt/rucio/etc
5656
EXPOSE 80
5757
EXPOSE 443
5858

59+
ARG POLICY_PACKAGE_REQUIREMENTS
60+
ARG USER=root
61+
USER root
62+
RUN if [ -n "$POLICY_PACKAGE_REQUIREMENTS" ]; then \
63+
dnf install -y git && \
64+
for package in $(echo $POLICY_PACKAGE_REQUIREMENTS | tr "," "\n"); do \
65+
python3 -m pip install --no-cache-dir $package; \
66+
done; \
67+
dnf remove -y git && \
68+
dnf autoremove && \
69+
dnf clean all; \
70+
fi
71+
USER ${USER}
72+
5973
ENTRYPOINT ["/docker-entrypoint.sh"]

0 commit comments

Comments
 (0)