|
67 | 67 | docker_health_check_path: |
68 | 68 | description: 'Docker health check path' |
69 | 69 | value: ${{ jobs.parse-config.outputs.docker_health_check_path }} |
70 | | - docker_app_env_var_name: |
71 | | - description: 'Docker application environment variable name' |
72 | | - value: ${{ jobs.parse-config.outputs.docker_app_env_var_name }} |
73 | | - docker_app_env_var_value: |
74 | | - description: 'Docker application environment variable value' |
75 | | - value: ${{ jobs.parse-config.outputs.docker_app_env_var_value }} |
| 70 | + docker_run_options: |
| 71 | + description: 'Docker run options string for flexible container configuration' |
| 72 | + value: ${{ jobs.parse-config.outputs.docker_run_options }} |
76 | 73 |
|
77 | 74 | # Validation Configuration |
78 | 75 | validation_version: |
@@ -206,7 +203,18 @@ jobs: |
206 | 203 | |
207 | 204 | # Parse flexible Docker run options |
208 | 205 | docker_run_options=$(get_config ".docker.run_options" "-e API_TOKEN=test_token") |
209 | | - |
| 206 | +
|
| 207 | + # Legacy support: If run_options is not set but old env var settings exist, build compatibility string |
| 208 | + if [[ "$docker_run_options" == "-e API_TOKEN=test_token" ]] && [[ "$use_defaults" == "false" ]]; then |
| 209 | + legacy_env_name=$(yq eval ".docker.application.env_var_name" "$config_file" 2>/dev/null || echo "null") |
| 210 | + legacy_env_value=$(yq eval ".docker.application.env_var_value" "$config_file" 2>/dev/null || echo "null") |
| 211 | +
|
| 212 | + if [[ "$legacy_env_name" != "null" && "$legacy_env_value" != "null" ]]; then |
| 213 | + docker_run_options="-e ${legacy_env_name}=${legacy_env_value}" |
| 214 | + echo "⚠️ Using legacy docker.application.env_var_* format. Consider migrating to docker.run_options." |
| 215 | + fi |
| 216 | + fi |
| 217 | +
|
210 | 218 | # Parse Validation Configuration |
211 | 219 | validation_version=$(get_config ".validation.version" "1.0.0-validation") |
212 | 220 | validation_test_version=$(get_config ".validation.test_version" "validation-test") |
@@ -275,8 +283,7 @@ jobs: |
275 | 283 | echo " - GHCR: $docker_registry_ghcr" |
276 | 284 | echo " - Health Port: $docker_health_check_port" |
277 | 285 | echo " - Health Path: $docker_health_check_path" |
278 | | - echo " - App Env Name: $docker_app_env_var_name" |
279 | | - echo " - App Env Value: $docker_app_env_var_value" |
| 286 | + echo " - Run Options: $docker_run_options" |
280 | 287 | echo "" |
281 | 288 | echo "Validation:" |
282 | 289 | echo " - Version: $validation_version" |
|
0 commit comments