Skip to content

Commit a357669

Browse files
mrnicegyu11Dustin Kaiser
andauthored
✨⚗️ Make director (v1) run with self-signed SSL certificates (ITISFoundation#2667)
In case the director must access a registry in a secure way using non-standard certificates (e.g. such as self-signed certificates), this call is needed. Co-authored-by: Dustin Kaiser <[email protected]>
1 parent 05a2f81 commit a357669

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

services/director/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ RUN adduser \
3131
--home /home/${SC_USER_NAME} \
3232
${SC_USER_NAME}
3333

34+
3435
# Sets utf-8 encoding for Python et al
3536
ENV LANG=C.UTF-8
3637
# Turns off writing .pyc files; superfluous on an ephemeral container.
@@ -131,7 +132,6 @@ HEALTHCHECK --interval=30s \
131132
--start-period=30s \
132133
--retries=3 \
133134
CMD ["python3", "/home/scu/services/director/docker/healthcheck.py", "http://localhost:8080/v0/"]
134-
135135
ENTRYPOINT [ "services/director/docker/entrypoint.sh" ]
136136
CMD ["services/director/docker/boot.sh"]
137137

services/director/docker/entrypoint.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ INFO="INFO: [$(basename "$0")] "
88
WARNING="WARNING: [$(basename "$0")] "
99
ERROR="ERROR: [$(basename "$0")] "
1010

11+
# Read self-signed SSH certificates (if applicable)
12+
#
13+
# In case the director must access a docker registry in a secure way using
14+
# non-standard certificates (e.g. such as self-signed certificates), this call is needed.
15+
# It needs to be executed as root.
16+
update-ca-certificates
17+
1118
# This entrypoint script:
1219
#
1320
# - Executes *inside* of the container upon start as --user [default root]
@@ -17,7 +24,7 @@ ERROR="ERROR: [$(basename "$0")] "
1724
echo "$INFO" "Entrypoint for stage ${SC_BUILD_TARGET} ..."
1825
echo "$INFO" "User :$(id "$(whoami)")"
1926
echo "$INFO" "Workdir :$(pwd)"
20-
echo scuUser :"$(id scu)"
27+
echo scuUser :"$(id scu)"
2128

2229
if [ "${SC_BUILD_TARGET}" = "development" ]
2330
then

0 commit comments

Comments
 (0)