Commit c43bfed8 authored by Natanael Copa's avatar Natanael Copa
Browse files

db: add support for --no-cache

Implement --no-cache. The index is read directly from network and not
cached. This is useful for docker, where you install a set of packages
and directly after purge the cache. (see
https://github.com/gliderlabs/docker-alpine/blob/1fc9e59d1689fc4eaf930ec66389fe58062fccec/builder/scripts/apk-install)

fixes #4905
parent 14b74c4d
......@@ -124,6 +124,9 @@ static int option_parse_global(void *ctx, struct apk_db_options *dbopts, int opt
case 0x109:
apk_flags |= APK_NO_NETWORK;
break;
case 0x115:
apk_flags |= APK_NO_CACHE;
break;
case 0x112:
dbopts->arch = optarg;
break;
......@@ -173,6 +176,7 @@ static const struct apk_option options_global[] = {
{ 0x108, "repositories-file", "Override repositories file",
required_argument, "REPOFILE" },
{ 0x109, "no-network", "Do not use network (cache is still used)" },
{ 0x115, "no-cache", "Read uncached index from network" },
{ 0x112, "arch", "Use architecture with --root",
required_argument, "ARCH" },
{ 0x114, "print-arch", "Print default arch and exit" },
......
......@@ -76,6 +76,7 @@ extern char **apk_argv;
#define APK_NO_NETWORK 0x1000
#define APK_OVERLAY_FROM_STDIN 0x2000
#define APK_NO_SCRIPTS 0x4000
#define APK_NO_CACHE 0x8000
/* default architecture for APK packages. */
#if defined(__x86_64__)
......
......@@ -2198,7 +2198,13 @@ int apk_db_add_repository(apk_database_t _db, apk_blob_t _repository)
if (apk_flags & APK_UPDATE_CACHE)
apk_repository_update(db, repo);
}
r = apk_repo_format_cache_index(APK_BLOB_BUF(buf), repo);
if (apk_flags & APK_NO_CACHE) {
r = apk_repo_format_real_url(db, repo, NULL, buf, sizeof(buf));
if (r == 0)
apk_message("fetch %s", buf);
} else {
r = apk_repo_format_cache_index(APK_BLOB_BUF(buf), repo);
}
} else {
db->local_repos |= BIT(repo_num);
db->available_repos |= BIT(repo_num);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment