From a8aef166dff01d9f01b44e3bda9937cbbc64d161 Mon Sep 17 00:00:00 2001 From: taoky Date: Sat, 19 Dec 2020 17:51:24 +0800 Subject: [PATCH 1/6] skopeo-sync: init --- skopeo-sync/Dockerfile | 4 ++++ skopeo-sync/sync.sh | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 skopeo-sync/Dockerfile create mode 100644 skopeo-sync/sync.sh diff --git a/skopeo-sync/Dockerfile b/skopeo-sync/Dockerfile new file mode 100644 index 0000000..8a6a27a --- /dev/null +++ b/skopeo-sync/Dockerfile @@ -0,0 +1,4 @@ +FROM ustcmirror/base:alpine +LABEL maintainer "Keyu Tao " +RUN apk add --no-cache skopeo +ADD sync.sh / diff --git a/skopeo-sync/sync.sh b/skopeo-sync/sync.sh new file mode 100644 index 0000000..df4329d --- /dev/null +++ b/skopeo-sync/sync.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +cat > /etc/skopeo-images.yaml < Date: Sat, 19 Dec 2020 23:04:05 +0800 Subject: [PATCH 2/6] skopeo: set sync dest to registry --- skopeo-sync/Dockerfile | 3 ++- skopeo-sync/skopeo-images.yaml | 10 ++++++++++ skopeo-sync/sync.sh | 32 ++------------------------------ 3 files changed, 14 insertions(+), 31 deletions(-) create mode 100644 skopeo-sync/skopeo-images.yaml mode change 100644 => 100755 skopeo-sync/sync.sh diff --git a/skopeo-sync/Dockerfile b/skopeo-sync/Dockerfile index 8a6a27a..f40c175 100644 --- a/skopeo-sync/Dockerfile +++ b/skopeo-sync/Dockerfile @@ -1,4 +1,5 @@ -FROM ustcmirror/base:alpine +FROM ustcmirror/base:alpine-edge LABEL maintainer "Keyu Tao " RUN apk add --no-cache skopeo ADD sync.sh / +ADD skopeo-images.yaml /etc/ diff --git a/skopeo-sync/skopeo-images.yaml b/skopeo-sync/skopeo-images.yaml new file mode 100644 index 0000000..7429e57 --- /dev/null +++ b/skopeo-sync/skopeo-images.yaml @@ -0,0 +1,10 @@ +k8s.gcr.io: + images: + kube-apiserver: + - v1.18.3 + - v1.18.4 + - v1.18.5 +registry.hub.docker.com: + images: + library/hello-world: + - latest diff --git a/skopeo-sync/sync.sh b/skopeo-sync/sync.sh old mode 100644 new mode 100755 index df4329d..8df3bc8 --- a/skopeo-sync/sync.sh +++ b/skopeo-sync/sync.sh @@ -1,32 +1,4 @@ #!/usr/bin/env bash -cat > /etc/skopeo-images.yaml < Date: Sat, 19 Dec 2020 23:39:40 +0800 Subject: [PATCH 3/6] skopeo working now --- skopeo-sync/skopeo-images.yaml | 20 ++++++++++++++++++++ skopeo-sync/sync.sh | 13 +++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/skopeo-sync/skopeo-images.yaml b/skopeo-sync/skopeo-images.yaml index 7429e57..76e1020 100644 --- a/skopeo-sync/skopeo-images.yaml +++ b/skopeo-sync/skopeo-images.yaml @@ -1,9 +1,29 @@ k8s.gcr.io: images: + pause: + - 3.1 + - 3.2 kube-apiserver: - v1.18.3 - v1.18.4 - v1.18.5 + kube-controller-manager: + - v1.18.3 + - v1.18.4 + - v1.18.5 + kube-scheduler: + - v1.18.3 + - v1.18.4 + - v1.18.5 + kube-proxy: + - v1.18.3 + - v1.18.4 + - v1.18.5 + etcd: + - 3.4.3-0 + - 3.4.7-0 + coredns: + - 1.6.7 registry.hub.docker.com: images: library/hello-world: diff --git a/skopeo-sync/sync.sh b/skopeo-sync/sync.sh index 8df3bc8..faedd1c 100755 --- a/skopeo-sync/sync.sh +++ b/skopeo-sync/sync.sh @@ -1,4 +1,13 @@ #!/usr/bin/env bash -skopeo login -u mirror -p "$REGISTRY_PASSWD" "$REGISTRY_HOST" -exec skopeo --insecure-policy sync --scoped --src yaml --dest docker /etc/skopeo-images.yaml "$REGISTRY_HOST" +VERIFY_TLS=${VERIFY_TLS:-"false"} + +if [ -n "$NEEDS_LOGIN" ]; then + skopeo login --tls-verify="$VERIFY_TLS" "$REGISTRY_HOST" -u "$REGISTRY_USERNAME" -p "$REGISTRY_PASSWORD" + if [ $? -ne 0 ]; then + echo "Registry login failed" + exit 255 + fi +fi + +exec skopeo --insecure-policy sync --dest-tls-verify="$VERIFY" --scoped --src yaml --dest docker /etc/skopeo-images.yaml "$REGISTRY_HOST" From 95cefe4b2e04c12d969b4e68a3483c7545206c72 Mon Sep 17 00:00:00 2001 From: taoky Date: Sun, 20 Dec 2020 00:44:41 +0800 Subject: [PATCH 4/6] skopeo: fix skopeo parameters --- skopeo-sync/sync.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skopeo-sync/sync.sh b/skopeo-sync/sync.sh index faedd1c..7c98df7 100755 --- a/skopeo-sync/sync.sh +++ b/skopeo-sync/sync.sh @@ -10,4 +10,4 @@ if [ -n "$NEEDS_LOGIN" ]; then fi fi -exec skopeo --insecure-policy sync --dest-tls-verify="$VERIFY" --scoped --src yaml --dest docker /etc/skopeo-images.yaml "$REGISTRY_HOST" +exec skopeo --insecure-policy sync --dest-tls-verify="$VERIFY_TLS" --src yaml --dest docker /etc/skopeo-images.yaml "$REGISTRY_HOST" From 6545001d8b8588dff38c1910bd61ca35ea81726a Mon Sep 17 00:00:00 2001 From: taoky Date: Tue, 22 Dec 2020 01:54:23 +0800 Subject: [PATCH 5/6] skopeo: remove yaml config and set scoped --- skopeo-sync/skopeo-images.yaml | 30 ------------------------------ skopeo-sync/sync.sh | 7 ++++++- 2 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 skopeo-sync/skopeo-images.yaml diff --git a/skopeo-sync/skopeo-images.yaml b/skopeo-sync/skopeo-images.yaml deleted file mode 100644 index 76e1020..0000000 --- a/skopeo-sync/skopeo-images.yaml +++ /dev/null @@ -1,30 +0,0 @@ -k8s.gcr.io: - images: - pause: - - 3.1 - - 3.2 - kube-apiserver: - - v1.18.3 - - v1.18.4 - - v1.18.5 - kube-controller-manager: - - v1.18.3 - - v1.18.4 - - v1.18.5 - kube-scheduler: - - v1.18.3 - - v1.18.4 - - v1.18.5 - kube-proxy: - - v1.18.3 - - v1.18.4 - - v1.18.5 - etcd: - - 3.4.3-0 - - 3.4.7-0 - coredns: - - 1.6.7 -registry.hub.docker.com: - images: - library/hello-world: - - latest diff --git a/skopeo-sync/sync.sh b/skopeo-sync/sync.sh index 7c98df7..43e39c1 100755 --- a/skopeo-sync/sync.sh +++ b/skopeo-sync/sync.sh @@ -2,6 +2,11 @@ VERIFY_TLS=${VERIFY_TLS:-"false"} +if [ ! -f /etc/skopeo-images.yaml ]; then + echo "Please bind mount skopeo config file to /etc/skopeo-images.yaml" + exit 255 +fi + if [ -n "$NEEDS_LOGIN" ]; then skopeo login --tls-verify="$VERIFY_TLS" "$REGISTRY_HOST" -u "$REGISTRY_USERNAME" -p "$REGISTRY_PASSWORD" if [ $? -ne 0 ]; then @@ -10,4 +15,4 @@ if [ -n "$NEEDS_LOGIN" ]; then fi fi -exec skopeo --insecure-policy sync --dest-tls-verify="$VERIFY_TLS" --src yaml --dest docker /etc/skopeo-images.yaml "$REGISTRY_HOST" +exec skopeo --insecure-policy sync --dest-tls-verify="$VERIFY_TLS" --scoped --src yaml --dest docker /etc/skopeo-images.yaml "$REGISTRY_HOST" From 82f5d923f562032312559184be47e128a17394f4 Mon Sep 17 00:00:00 2001 From: taoky Date: Tue, 22 Dec 2020 02:02:42 +0800 Subject: [PATCH 6/6] skopeo: fix Dockerfile --- skopeo-sync/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/skopeo-sync/Dockerfile b/skopeo-sync/Dockerfile index f40c175..c49b96f 100644 --- a/skopeo-sync/Dockerfile +++ b/skopeo-sync/Dockerfile @@ -2,4 +2,3 @@ FROM ustcmirror/base:alpine-edge LABEL maintainer "Keyu Tao " RUN apk add --no-cache skopeo ADD sync.sh / -ADD skopeo-images.yaml /etc/