Ubuntu Docker Images

Merge ~virtustom/ubuntu-docker-images/+git/utils:azurecr-ubuntu-namespace into ~ubuntu-docker-images/ubuntu-docker-images/+git/utils:main

  1. Git
  2. lp:~virtustom/ubuntu-docker-images/+git/utils
  3. azurecr-ubuntu-namespace
  4. Merge into main
Proposed by Tomáš Virtus
Status: Merged
Merged at revision: 71cb1a0d0cac14ba359e353275ff37a3fcb3a1aa
Proposed branch: ~virtustom/ubuntu-docker-images/+git/utils:azurecr-ubuntu-namespace
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/utils:main
Diff against target: 123 lines (+11/-11)
6 files modified
helpers/validate-args.sh (+1/-1)
list-all-images.sh (+2/-2)
list-manifest-for-image-and-tag.sh (+2/-2)
list-tags-for-image.sh (+2/-2)
multi-arch-tagger.sh (+2/-2)
tag-images.sh (+2/-2)
Reviewer Review Type Date Requested Status
Sergio Durigan Junior Approve
Athos Ribeiro Pending
Canonical Server Pending
Review via email: mp+419682@code.launchpad.net

Commit message

azurecr: Change namespace from canonical to ubuntu

To post a comment you must log in.
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

LGTM, thanks for doing this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/helpers/validate-args.sh b/helpers/validate-args.sh
2index 954c889..1f1ae91 100644
3--- a/helpers/validate-args.sh
4+++ b/helpers/validate-args.sh
5@@ -13,7 +13,7 @@ export progname progdir
6 readonly -A namespace_registry_regexes=(
7 [ubuntu]='docker|aws'
8 [lts]='aws'
9- [canonical]='azure'
10+ [ubuntu]='azure'
11 )
12
13 validate_var ()
14diff --git a/list-all-images.sh b/list-all-images.sh
15index 2e6df71..ee5be16 100755
16--- a/list-all-images.sh
17+++ b/list-all-images.sh
18@@ -24,7 +24,7 @@ $progname -- Obtain the list of images from a certain repository.
19
20 Usage:
21
22- $progname [-a <TOKEN>] -r <docker|aws|azure> -n <ubuntu|lts|canonical> [-d]
23+ $progname [-a <TOKEN>] -r <docker|aws|azure> -n <ubuntu|lts> [-d]
24
25 Arguments:
26
27@@ -37,7 +37,7 @@ Arguments:
28 Possible values: docker, aws, azure
29
30 -n NAMESPACE|--namespace NAMESPACE: Namespace to consult.
31- Possible values: ubuntu, lts, canonical
32+ Possible values: ubuntu, lts
33
34 -d|--debug Print debug statements. This includes printing
35 the authentication token if using Dockerhub.
36diff --git a/list-manifest-for-image-and-tag.sh b/list-manifest-for-image-and-tag.sh
37index 57dd832..794d7cf 100755
38--- a/list-manifest-for-image-and-tag.sh
39+++ b/list-manifest-for-image-and-tag.sh
40@@ -38,7 +38,7 @@ Usage (when using AWS):
41
42 Usage (when using Azure):
43
44- $progname [-a <TOKEN>] -r azure -n canonical -i <IMAGE> -t <TAG> [-d]
45+ $progname [-a <TOKEN>] -r azure -n ubuntu -i <IMAGE> -t <TAG> [-d]
46
47 Arguments:
48
49@@ -56,7 +56,7 @@ Arguments:
50 Possible values: docker, aws, azure
51
52 -n NAMESPACE|--namespace NAMESPACE Namespace to consult.
53- Possible values: ubuntu, lts, canonical
54+ Possible values: ubuntu, lts
55
56 -i IMAGE|--image IMAGE Name of an image from the repository (without
57 namespace), for example 'postgres' or 'redis'.
58diff --git a/list-tags-for-image.sh b/list-tags-for-image.sh
59index efefd6c..3a85a16 100755
60--- a/list-tags-for-image.sh
61+++ b/list-tags-for-image.sh
62@@ -24,7 +24,7 @@ $progname -- Obtain the list of tags from a certain image.
63
64 Usage:
65
66- $progname [-a <TOKEN>] -r <docker|aws|azure> -n <ubuntu|lts|canonical> -i <IMAGE> [-d]
67+ $progname [-a <TOKEN>] -r <docker|aws|azure> -n <ubuntu|lts> -i <IMAGE> [-d]
68
69 Arguments:
70
71@@ -37,7 +37,7 @@ Arguments:
72 Possible values: docker, aws, azure
73
74 -n NAMESPACE|--namespace NAMESPACE Namespace to consult.
75- Possible values: ubuntu, lts, canonical
76+ Possible values: ubuntu, lts
77
78 -i IMAGE|--image IMAGE Image to obtain tags from.
79
80diff --git a/multi-arch-tagger.sh b/multi-arch-tagger.sh
81index 2e3dbb4..9133dc6 100755
82--- a/multi-arch-tagger.sh
83+++ b/multi-arch-tagger.sh
84@@ -38,7 +38,7 @@ Usage (when using AWS):
85
86 Usage (when using Azure):
87
88- $progname [-a <TOKEN>] -r azure -n canonical -i <IMAGE> -s <SOURCE_TAG> -t <NEW_TAG> [-d]
89+ $progname [-a <TOKEN>] -r azure -n ubuntu -i <IMAGE> -s <SOURCE_TAG> -t <NEW_TAG> [-d]
90
91 Arguments:
92
93@@ -56,7 +56,7 @@ Arguments:
94 Possible values: docker, aws, azure
95
96 -n NAMESPACE|--namespace NAMESPACE Namespace to consult.
97- Possible values: ubuntu, lts, canonical
98+ Possible values: ubuntu, lts
99
100 -i IMAGE|--image IMAGE Name of an image from the repository (without
101 namespace), for example 'postgres' or 'redis'.
102diff --git a/tag-images.sh b/tag-images.sh
103index dfce404..61797f2 100755
104--- a/tag-images.sh
105+++ b/tag-images.sh
106@@ -69,7 +69,7 @@ all architectures using a single machine.
107
108 Usage:
109
110- $progname [-a <TOKEN>] -r <docker|aws|azure> -n <ubuntu|lts|canonical> [-d] [-- IMAGE_1 IMAGE_2 ... IMAGE_N]
111+ $progname [-a <TOKEN>] -r <docker|aws|azure> -n <ubuntu|lts> [-d] [-- IMAGE_1 IMAGE_2 ... IMAGE_N]
112
113 Arguments:
114
115@@ -77,7 +77,7 @@ Arguments:
116 Possible values: docker, aws, azure
117
118 -n NAMESPACE|--namespace NAMESPACE Namespace to consult.
119- Possible values: ubuntu, lts, canonical
120+ Possible values: ubuntu, lts
121
122 -f|--force Force tagging, even if the script would think
123 that it's not needed. This mostly applies for

Subscribers

People subscribed via source and target branches