Skip to contentSkip to conversation

docker-ce: remove unused docker-registry.service file

PATCH In review Martin Jansa 2 participants 4 messages Jul 2, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 docker-ce: remove unused docker-registry.service file

From: Martin Jansa <[email protected]>

---
 .../docker/docker-ce/docker-registry.service  | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 recipes-containers/docker/docker-ce/docker-registry.service
recipes-containers/docker/docker-ce/docker-registry.service deleted +0 -19
deleted file mode 100644
index 7b4bc46..0000000
@@ -1,19 +0,0 @@
-[Unit]
-Description=docker private registry service
-After=docker.service
-
-[Service]
-ExecStartPre=-/usr/bin/docker kill registry
-ExecStartPre=-/usr/bin/docker rm registry
-ExecStart=/usr/bin/docker run --name registry -v /mirror/registry:/tmp/ -p 5000:5000 \
-                          -e "STANDALONE=true" \
-                          -e "MIRROR_SOURCE=https://registry-1.docker.io" \
-                          -e "MIRROR_SOURCE_INDEX=https://index.docker.io" \
-                          -e "SETTINGS_FLAVOR=local" \
-                          registry
-ExecStop=-/usr/bin/docker stop registry
-Restart=always
-RestartSec=10s
-
-[Install]
-WantedBy=multi-user.target
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 docker: move docker.init back to files directory to use it from docker-moby

From: Martin Jansa <[email protected]>

* it was moved for some reason in:
http://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/?id=929372946aeb85953d1ca6acc428d73fbac52a56

but docker-moby uses it as well and now started to fail with:
ERROR: docker-moby-19.03.12+git9dc6525e6118a25fab2be322d1914740ea842495-r0
do_fetch: Fetcher failure: Unable to find file file://docker.init anywhere. ..

---
 recipes-containers/docker/{docker-ce => files}/docker.init | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename recipes-containers/docker/{docker-ce => files}/docker.init (100%)
recipes-containers/docker/files/docker.init renamed from recipes-containers/docker/docker-ce/docker.init +0 -0
similarity index 100%
rename from recipes-containers/docker/docker-ce/docker.init
rename to recipes-containers/docker/files/docker.init
Signature · 1 line
2.25.1
#2 lore raw

Re: [meta-virtualization] [PATCH 2/2] docker: move docker.init back to files directory to use it from docker-moby

Quoted 5 lines · Martin Jansa

From: Martin Jansa <[email protected]>

* it was moved for some reason in:
http://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/?id=929372946aeb85953d1ca6acc428d73fbac52a56

None of the patches are really common anymore, and there were some duplicated once (I was hacking an unused one for a while).

Thanks for fixing up that miss on the one common file.

merged.

Bruce

Quoted 20 lines

but docker-moby uses it as well and now started to fail with:
ERROR: docker-moby-19.03.12+git9dc6525e6118a25fab2be322d1914740ea842495-r0
do_fetch: Fetcher failure: Unable to find file file://docker.init anywhere. ..

---
 recipes-containers/docker/{docker-ce => files}/docker.init | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename recipes-containers/docker/{docker-ce => files}/docker.init (100%)
recipes-containers/docker/files/docker.init renamed from recipes-containers/docker/docker-ce/docker.init +0 -1
similarity index 100%
rename from recipes-containers/docker/docker-ce/docker.init
rename to recipes-containers/docker/files/docker.init
--

2.25.1

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
#3 lore raw
In reply to Martin Jansa

merged

Bruce

Quoted 38 lines · Martin Jansa

From: Martin Jansa <[email protected]>

---
 .../docker/docker-ce/docker-registry.service  | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 recipes-containers/docker/docker-ce/docker-registry.service
recipes-containers/docker/docker-ce/docker-registry.service deleted +0 -20
deleted file mode 100644
index 7b4bc46..0000000
@@ -1,19 +0,0 @@
-[Unit]
-Description=docker private registry service
-After=docker.service
-
-[Service]
-ExecStartPre=-/usr/bin/docker kill registry
-ExecStartPre=-/usr/bin/docker rm registry
-ExecStart=/usr/bin/docker run --name registry -v /mirror/registry:/tmp/ -p 5000:5000 \
-                          -e "STANDALONE=true" \
-                          -e "MIRROR_SOURCE=https://registry-1.docker.io" \
-                          -e "MIRROR_SOURCE_INDEX=https://index.docker.io" \
-                          -e "SETTINGS_FLAVOR=local" \
-                          registry
-ExecStop=-/usr/bin/docker stop registry
-Restart=always
-RestartSec=10s
-
-[Install]
-WantedBy=multi-user.target
--

2.25.1

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II