Skip to content

Commit

Permalink
Fix cop
Browse files Browse the repository at this point in the history
  • Loading branch information
npezza93 committed Jan 17, 2025
1 parent 9685117 commit 7a14606
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion lib/kamal/cli/registry.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Kamal::Cli::Registry < Kamal::Cli::Base
option :skip_remote, aliases: "-R", type: :boolean, default: false, desc: "Skip remote login"
def setup
ensure_docker_installed

if KAMAL.registry.local?
run_locally { execute *KAMAL.registry.setup } unless options[:skip_local]
else
Expand Down
11 changes: 5 additions & 6 deletions lib/kamal/commands/registry.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
class Kamal::Commands::Registry < Kamal::Commands::Base
delegate :registry, to: :config
delegate :local?, :local_port, to: :registry

def login(registry_config: nil)
registry_config ||= config.registry

return if local?
return if registry_config.local?

docker :login,
registry_config.server,
Expand All @@ -19,10 +16,12 @@ def logout(registry_config: nil)
docker :logout, registry_config.server
end

def setup
def setup(registry_config: nil)
registry_config ||= config.registry

combine \
docker(:start, "kamal-docker-registry"),
docker(:run, "--detach", "-p", "127.0.0.1:#{local_port}:5000", "--name", "kamal-docker-registry", "registry:3.0.0-rc.2"),
docker(:run, "--detach", "-p", "127.0.0.1:#{registry_config.local_port}:5000", "--name", "kamal-docker-registry", "registry:3.0.0-rc.2"),
by: "||"
end

Expand Down
2 changes: 1 addition & 1 deletion test/commands/registry_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class CommandsRegistryTest < ActiveSupport::TestCase

test "registry setup" do
@config[:registry] = { "server" => "localhost:5000" }
assert_equal "docker start kamal-docker-registry || docker run --detach -p 127.0.0.1:5000:5000 --name kamal-docker-registry registry:2", registry.setup.join(" ")
assert_equal "docker start kamal-docker-registry || docker run --detach -p 127.0.0.1:5000:5000 --name kamal-docker-registry registry:3.0.0-rc.2", registry.setup.join(" ")
end

test "registry remove" do
Expand Down

0 comments on commit 7a14606

Please sign in to comment.