Minor adjustment to sed filtering to avoid the need to escape an unim…

…portant plus in regex.
ucphhpc · Jan 7, 2025 · 24f0f1a · 24f0f1a
1 parent 836c4d5
commit 24f0f1a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Dockerfile.centos7 b/Dockerfile.centos7
@@ -680,11 +680,11 @@ RUN if [ ! -e "${CERT_DIR}/.persistent" ]; then \
     && chown 0:0 *.key server.crt ca.pem \
     && chmod 400 *.key server.crt ca.pem combined.pem server.ca.pem \
     && openssl x509 -noout -fingerprint -sha256 -in combined.pem | \
-       sed 's/.+ Fingerprint=//g' > combined.pem.sha256 \
+       sed 's/.* Fingerprint=//g' > combined.pem.sha256 \
     && ssh-keygen -l -E md5 -f combined.pub | \
-       sed 's/.+ MD5://g,s/ .*//g' > combined.pub.md5 \
+       sed 's/.* MD5://g,s/ .*//g' > combined.pub.md5 \
     && ssh-keygen -l -f combined.pub | \
-       sed 's/.+ SHA256://g,s/ .*//g' > combined.pub.sha256; fi
+       sed 's/.* SHA256://g,s/ .*//g' > combined.pub.sha256; fi
 
 # Prepare keys for mig
 RUN if [ ! -e "${CERT_DIR}/.persistent" ]; then \

diff --git a/Dockerfile.rocky8 b/Dockerfile.rocky8
@@ -697,11 +697,11 @@ RUN if [ ! -e "${CERT_DIR}/.persistent" ]; then \
     && chown 0:0 *.key server.crt ca.pem \
     && chmod 400 *.key server.crt ca.pem combined.pem server.ca.pem \
     && openssl x509 -noout -fingerprint -sha256 -in combined.pem | \
-       sed 's/.+ Fingerprint=//g' > combined.pem.sha256 \
+       sed 's/.* Fingerprint=//g' > combined.pem.sha256 \
     && ssh-keygen -l -E md5 -f combined.pub | \
-       sed 's/.+ MD5://g,s/ .*//g' > combined.pub.md5 \
+       sed 's/.* MD5://g,s/ .*//g' > combined.pub.md5 \
     && ssh-keygen -l -f combined.pub | \
-       sed 's/.+ SHA256://g,s/ .*//g' > combined.pub.sha256; fi
+       sed 's/.* SHA256://g,s/ .*//g' > combined.pub.sha256; fi
 
 # Prepare keys for mig
 RUN if [ ! -e "${CERT_DIR}/.persistent" ]; then \

diff --git a/Dockerfile.rocky9 b/Dockerfile.rocky9
@@ -656,11 +656,11 @@ RUN if [ ! -e "${CERT_DIR}/.persistent" ]; then \
     && chown 0:0 *.key server.crt ca.pem \
     && chmod 400 *.key server.crt ca.pem combined.pem server.ca.pem \
     && openssl x509 -noout -fingerprint -sha256 -in combined.pem | \
-       sed 's/.+ Fingerprint=//g' > combined.pem.sha256 \
+       sed 's/.* Fingerprint=//g' > combined.pem.sha256 \
     && ssh-keygen -l -E md5 -f combined.pub | \
-       sed 's/.+ MD5://g,s/ .*//g' > combined.pub.md5 \
+       sed 's/.* MD5://g,s/ .*//g' > combined.pub.md5 \
     && ssh-keygen -l -f combined.pub | \
-       sed 's/.+ SHA256://g,s/ .*//g' > combined.pub.sha256; fi
+       sed 's/.* SHA256://g,s/ .*//g' > combined.pub.sha256; fi
 
 # Prepare keys for mig
 RUN if [ ! -e "${CERT_DIR}/.persistent" ]; then \