You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/03/22 17:19:45 UTC
[1/2] mesos git commit: Added normalize method to registry puller.
Repository: mesos
Updated Branches:
refs/heads/master 105917214 -> e951a9aac
Added normalize method to registry puller.
Review: https://reviews.apache.org/r/44672/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e56d1a84
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e56d1a84
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e56d1a84
Branch: refs/heads/master
Commit: e56d1a84af4d5ca97f5b41c701c23637d3d0fd65
Parents: 1059172
Author: Gilbert Song <so...@gmail.com>
Authored: Tue Mar 22 09:15:50 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Mar 22 09:17:11 2016 -0700
----------------------------------------------------------------------
.../provisioner/docker/registry_puller.cpp | 43 +++++++++++++++++---
1 file changed, 37 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e56d1a84/src/slave/containerizer/mesos/provisioner/docker/registry_puller.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/docker/registry_puller.cpp b/src/slave/containerizer/mesos/provisioner/docker/registry_puller.cpp
index 6d637ed..d3eccd9 100644
--- a/src/slave/containerizer/mesos/provisioner/docker/registry_puller.cpp
+++ b/src/slave/containerizer/mesos/provisioner/docker/registry_puller.cpp
@@ -156,15 +156,46 @@ RegistryPullerProcess::RegistryPullerProcess(
fetcher(_fetcher) {}
+static spec::ImageReference normalize(
+ const spec::ImageReference& _reference,
+ const http::URL& defaultRegistryUrl)
+{
+ spec::ImageReference reference = _reference;
+
+ // Determine which registry domain should be used.
+ Option<string> registryDomain;
+
+ if (_reference.has_registry()) {
+ registryDomain = _reference.registry();
+ } else {
+ registryDomain = defaultRegistryUrl.domain.isSome()
+ ? defaultRegistryUrl.domain.get()
+ : Option<string>();
+ }
+
+ // Check if necessary to add 'library/' prefix for the case that the
+ // registry is docker default 'https://registry-1.docker.io',
+ // because docker official images locate in 'library/' directory.
+ // For details, please see:
+ // https://github.com/docker-library/official-images
+ // https://github.com/docker/docker/blob/v1.10.2/reference/reference.go
+ if (registryDomain.isSome() &&
+ strings::contains(registryDomain.get(), "docker.io") &&
+ !strings::contains(_reference.repository(), "/")) {
+ const string repository = path::join("library", _reference.repository());
+
+ reference.set_repository(repository);
+ }
+
+ return reference;
+}
+
+
Future<vector<string>> RegistryPullerProcess::pull(
- const spec::ImageReference& reference,
+ const spec::ImageReference& _reference,
const string& directory)
{
- // TODO(jieyu): Consider introducing a 'normalize' function to
- // normalize 'reference' here. For instance, we need to add
- // 'library/' prefix if the user does not specify a repository.
- // Also consider merging the registry generation logic below into
- // 'normalize'.
+ spec::ImageReference reference = normalize(_reference, defaultRegistryUrl);
URI manifestUri;
if (reference.has_registry()) {
[2/2] mesos git commit: Added test for registry puller normalize.
Posted by ji...@apache.org.
Added test for registry puller normalize.
Review: https://reviews.apache.org/r/44673/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e951a9aa
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e951a9aa
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e951a9aa
Branch: refs/heads/master
Commit: e951a9aac9f78c84ddad43536098ce4e323aef2b
Parents: e56d1a8
Author: Gilbert Song <so...@gmail.com>
Authored: Tue Mar 22 09:17:20 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Mar 22 09:19:33 2016 -0700
----------------------------------------------------------------------
.../containerizer/provisioner_docker_tests.cpp | 75 ++++++++++++++++++++
1 file changed, 75 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e951a9aa/src/tests/containerizer/provisioner_docker_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_docker_tests.cpp b/src/tests/containerizer/provisioner_docker_tests.cpp
index e4b30b9..74bfce4 100644
--- a/src/tests/containerizer/provisioner_docker_tests.cpp
+++ b/src/tests/containerizer/provisioner_docker_tests.cpp
@@ -473,6 +473,81 @@ TEST_F(ProvisionerDockerPullerTest, ROOT_INTERNET_CURL_SimpleCommand)
driver.join();
}
+
+// This test verifies the normalization of the Docker repository name.
+// For official Docker images, users can omit the 'library/' prefix
+// when specifying the repository name (e.g., 'busybox').
+TEST_F(ProvisionerDockerPullerTest, ROOT_INTERNET_CURL_Normalize)
+{
+ Try<Owned<cluster::Master>> master = StartMaster();
+ ASSERT_SOME(master);
+
+ slave::Flags flags = CreateSlaveFlags();
+ flags.isolation = "docker/runtime,filesystem/linux";
+ flags.image_providers = "docker";
+ flags.docker_registry = "https://registry-1.docker.io";
+
+ Owned<MasterDetector> detector = master.get()->createDetector();
+ Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), flags);
+ ASSERT_SOME(slave);
+
+ MockScheduler sched;
+ MesosSchedulerDriver driver(
+ &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
+
+ EXPECT_CALL(sched, registered(&driver, _, _));
+
+ Future<vector<Offer>> offers;
+ EXPECT_CALL(sched, resourceOffers(&driver, _))
+ .WillOnce(FutureArg<1>(&offers))
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
+
+ driver.start();
+
+ AWAIT_READY(offers);
+ ASSERT_EQ(1u, offers->size());
+
+ const Offer& offer = offers.get()[0];
+
+ CommandInfo command;
+ command.set_shell(false);
+ command.set_value("/bin/ls");
+ command.add_arguments("ls");
+ command.add_arguments("-al");
+ command.add_arguments("/");
+
+ TaskInfo task = createTask(
+ offer.slave_id(),
+ Resources::parse("cpus:1;mem:128").get(),
+ command);
+
+ Image image;
+ image.set_type(Image::DOCKER);
+ image.mutable_docker()->set_name("alpine");
+
+ ContainerInfo* container = task.mutable_container();
+ container->set_type(ContainerInfo::MESOS);
+ container->mutable_mesos()->mutable_image()->CopyFrom(image);
+
+ Future<TaskStatus> statusRunning;
+ Future<TaskStatus> statusFinished;
+ EXPECT_CALL(sched, statusUpdate(&driver, _))
+ .WillOnce(FutureArg<1>(&statusRunning))
+ .WillOnce(FutureArg<1>(&statusFinished));
+
+ driver.launchTasks(offer.id(), {task});
+
+ AWAIT_READY_FOR(statusRunning, Seconds(60));
+ EXPECT_EQ(task.task_id(), statusRunning->task_id());
+ EXPECT_EQ(TASK_RUNNING, statusRunning->state());
+
+ AWAIT_READY(statusFinished);
+ EXPECT_EQ(task.task_id(), statusFinished->task_id());
+ EXPECT_EQ(TASK_FINISHED, statusFinished->state());
+
+ driver.stop();
+ driver.join();
+}
#endif
} // namespace tests {