diff --git a/Justfile b/Justfile index f472ead..41bcdf7 100644 --- a/Justfile +++ b/Justfile @@ -153,16 +153,16 @@ img_dockerfile_path := "infra" / "docker" / "pg_idkit-pg" + pg_image_version + " # Ensure that that a given file is present _ensure-file file: - #!/usr/bin/env -S bash -euo pipefail - @if [ ! -f "{{file}}" ]; then + #!/usr/bin/bash + if [ ! -f "{{file}}" ] ; then echo "[error] file [{{file}}] is required, but missing"; exit 1; fi; # Log in with docker using local credentials docker-login: - {{just}} ensure-file {{docker_password_path}} - {{just}} ensure-file {{docker_username_path}} + {{just}} _ensure-file {{docker_password_path}} + {{just}} _ensure-file {{docker_username_path}} cat {{docker_password_path}} | {{docker}} login {{docker_image_registry}} -u `cat {{docker_username_path}}` --password-stdin cp {{docker_config_dir}}/config.json {{docker_config_dir}}/.dockerconfigjson diff --git a/secrets/docker/.dockerconfigjson b/secrets/docker/.dockerconfigjson index f3906e9..37a45a3 100644 Binary files a/secrets/docker/.dockerconfigjson and b/secrets/docker/.dockerconfigjson differ diff --git a/secrets/docker/config.json b/secrets/docker/config.json index f3906e9..37a45a3 100644 Binary files a/secrets/docker/config.json and b/secrets/docker/config.json differ diff --git a/secrets/docker/password.secret b/secrets/docker/password.secret index c45aa68..4002491 100644 Binary files a/secrets/docker/password.secret and b/secrets/docker/password.secret differ