struct DkrImportName {
DkrImport *import;
- char *index_url;
char *name;
char *tag;
char *id;
sd_event *event;
CurlGlue *glue;
+ char *index_url;
+
Hashmap *names;
Hashmap *jobs;
dkr_import_on_finished on_finished;
void *userdata;
+
+ bool finished;
};
#define PROTOCOL_PREFIX "https://"
if (name->job_layer)
set_remove(name->job_layer->needed_by, name);
- free(name->index_url);
free(name->name);
free(name->id);
free(name->tag);
static void dkr_import_finish(DkrImport *import, int error) {
assert(import);
+ if (import->finished)
+ return;
+
+ import->finished = true;
+
if (import->on_finished)
import->on_finished(import, error, import->userdata);
else
l = fwrite(contents, size, nmemb, j->tar_stream);
if (l != nmemb) {
- r = -errno;
+ r = log_error_errno(errno, "Failed to write to tar: %m");
goto fail;
}
}
if (j->payload_size + sz > PAYLOAD_MAX) {
+ log_error("Payload too large.");
r = -EFBIG;
goto fail;
}
p = realloc(j->payload, j->payload_size + sz);
if (!p) {
- r = -ENOMEM;
+ r = log_oom();
goto fail;
}
assert(name);
assert(!name->job_images);
- url = strappenda(name->index_url, "/v1/repositories/", name->name, "/images");
+ url = strappenda(name->import->index_url, "/v1/repositories/", name->name, "/images");
return dkr_import_name_add_job(name, DKR_IMPORT_JOB_IMAGES, url, &name->job_images);
}
-int dkr_import_new(DkrImport **import, sd_event *event, dkr_import_on_finished on_finished, void *userdata) {
+int dkr_import_new(DkrImport **import, sd_event *event, const char *index_url, dkr_import_on_finished on_finished, void *userdata) {
_cleanup_(dkr_import_unrefp) DkrImport *i = NULL;
+ char *e;
int r;
assert(import);
+ assert(dkr_url_is_valid(index_url));
i = new0(DkrImport, 1);
if (!i)
i->on_finished = on_finished;
i->userdata = userdata;
+ i->index_url = strdup(index_url);
+ if (!i->index_url)
+ return -ENOMEM;
+
+ e = endswith(i->index_url, "/");
+ if (e)
+ *e = 0;
+
if (event)
i->event = sd_event_ref(event);
else {
curl_glue_unref(import->glue);
sd_event_unref(import->event);
+ free(import->index_url);
+
free(import);
return NULL;
return 1;
}
-int dkr_import_pull(DkrImport *import, const char *index_url, const char *name, const char *tag, const char *local, bool force_local) {
+int dkr_import_pull(DkrImport *import, const char *name, const char *tag, const char *local, bool force_local) {
_cleanup_(dkr_import_name_unrefp) DkrImportName *n = NULL;
- char *e;
int r;
assert(import);
- assert(dkr_url_is_valid(index_url));
assert(dkr_name_is_valid(name));
assert(dkr_tag_is_valid(tag));
assert(!local || machine_name_is_valid(local));
n->import = import;
- n->index_url = strdup(index_url);
- if (!n->index_url)
- return -ENOMEM;
- e = endswith(n->index_url, "/");
- if (e)
- *e = NULL;
-
n->name = strdup(name);
if (!n->name)
return -ENOMEM;
n->force_local = force_local;
}
- r = hashmap_put(import->names, name, n);
+ r = hashmap_put(import->names, n->name, n);
if (r < 0)
return r;
}
n = NULL;
-
return 0;
}
}
bool dkr_url_is_valid(const char *url) {
+ if (isempty(url))
+ return false;
if (!startswith(url, "http://") &&
!startswith(url, "https://"))