Merge pull request #707 from gerrod3/compose-signing-var

Fix docker-compose add_signing_service script
pulp · Jan 8, 2025 · 48380a8 · 48380a8
2 parents 02ebce2 + c35bf6f
commit 48380a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGES/647.bugfix b/CHANGES/647.bugfix
@@ -0,0 +1 @@
+Fixed default docker compose file not launching when PULP_SIGNING_KEY_FINGERPRINT was unset.
diff --git a/images/assets/add_signing_service.sh b/images/assets/add_signing_service.sh
@@ -3,7 +3,7 @@
 /usr/bin/wait_on_postgres.py
 /usr/bin/wait_on_database_migrations.sh
 
-if [ -n "${PULP_SIGNING_KEY_FINGERPRINT}" ]; then
+if [ -n "${PULP_SIGNING_KEY_FINGERPRINT-}" ]; then
   /usr/local/bin/pulpcore-manager add-signing-service "${COLLECTION_SIGNING_SERVICE}" /var/lib/pulp/scripts/collection_sign.sh "${PULP_SIGNING_KEY_FINGERPRINT}"
   /usr/local/bin/pulpcore-manager add-signing-service "${CONTAINER_SIGNING_SERVICE}" /var/lib/pulp/scripts/container_sign.sh "${PULP_SIGNING_KEY_FINGERPRINT}" --class container:ManifestSigningService
 fi
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed default docker compose file not launching when PULP_SIGNING_KEY_FINGERPRINT was unset.