Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deployment/helm/datamate/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ frontend:
- *logVolume
- name: cert-volume
configMap:
name: cube-security-cert-cert
name: cube-security-nginx-cert
optional: true
volumeMounts:
- name: log-volume
Expand Down
1 change: 1 addition & 0 deletions scripts/images/frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ COPY scripts/images/frontend/start.sh /opt/frontend/start.sh

RUN dos2unix /opt/frontend/start.sh \
&& chmod +x /opt/frontend/start.sh \
&& mkdir -p /etc/nginx/cert \
&& ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
&& rm -f /etc/nginx/conf.d/default.conf

Expand Down
12 changes: 6 additions & 6 deletions scripts/images/frontend/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ if [ -f "/cert/server.pem" ]; then
fi

if [ -f "/cert/server.key" ]; then
if openssl rsa -in /cert/server.key -passin pass:test_check -noout 2>/dev/null; then
cp /cert/server.key /etc/nginx/cert/server.key
else
echo "$CERT_PASS" | openssl rsa -in /cert/server.key -out /etc/nginx/cert/server.key -passin stdin
fi
chown nginx:nginx /etc/nginx/cert/server.key
if openssl rsa -in /cert/server.key -passin pass:test_check -noout 2>/dev/null; then
cp /cert/server.key /etc/nginx/cert/server.key
else
echo "$CERT_PASS" | openssl rsa -in /cert/server.key -out /etc/nginx/cert/server.key -passin stdin
fi
chown nginx:nginx /etc/nginx/cert/server.key
fi

if [ -f "/etc/nginx/cert/server.pem" ]; then
Expand Down
Loading