Unverified Commit 736c43fe authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #288215 from budimanjojo/patch-1

nixos/oci-containers: don't login if image exists locally
parents 7eea11e1 fd3fa9f2
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -252,10 +252,13 @@ let
      text = ''
        ${cfg.backend} rm -f ${name} || true
        ${optionalString (isValidLogin container.login) ''
          # try logging in, if it fails, check if image exists locally
          ${cfg.backend} login \
          ${container.login.registry} \
          --username ${container.login.username} \
          --password-stdin < ${container.login.passwordFile}
          --password-stdin < ${container.login.passwordFile} \
          || ${cfg.backend} image inspect ${container.image} >/dev/null \
          || { echo "image doesn't exist locally and login failed" >&2 ; exit 1; }
        ''}
        ${optionalString (container.imageFile != null) ''
          ${cfg.backend} load -i ${container.imageFile}