From 8e8ff61e0a06efd0ff27ba67a683479da9c1b08a Mon Sep 17 00:00:00 2001 From: Emmanuel Gomez Date: Thu, 30 Oct 2014 10:47:01 -0700 Subject: [PATCH 1/2] feat(docker-registry-s3): convert to template unit. Also convert to new X-Fleet syntax. --- docker-registry-s3/registry.1.service | 14 -------------- docker-registry-s3/registry.2.service | 14 -------------- docker-registry-s3/registry.3.service | 14 -------------- docker-registry-s3/registry@.service | 22 ++++++++++++++++++++++ 4 files changed, 22 insertions(+), 42 deletions(-) delete mode 100644 docker-registry-s3/registry.1.service delete mode 100644 docker-registry-s3/registry.2.service delete mode 100644 docker-registry-s3/registry.3.service create mode 100644 docker-registry-s3/registry@.service diff --git a/docker-registry-s3/registry.1.service b/docker-registry-s3/registry.1.service deleted file mode 100644 index 7307e7d..0000000 --- a/docker-registry-s3/registry.1.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Custom Docker Registry -After=docker.service - -[Service] -TimeoutStartSec=0 -ExecStartPre=-/usr/bin/docker kill registry1 -ExecStartPre=-/usr/bin/docker rm registry1 -ExecStartPre=/usr/bin/docker pull registry -ExecStart=/usr/bin/docker run -rm --name registry1 -p 5000:5000 -e AWS_KEY="replace-me" -e AWS_SECRET="replace-me" -e SETTINGS_FLAVOR=s3 -e AWS_BUCKET=replace-me -e STORAGE_PATH=/prod registry:0.7.1 -ExecStop=/usr/bin/docker stop registry1 - -[X-Fleet] -X-Conflicts=registry*.service diff --git a/docker-registry-s3/registry.2.service b/docker-registry-s3/registry.2.service deleted file mode 100644 index 8b7b278..0000000 --- a/docker-registry-s3/registry.2.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Custom Docker Registry -After=docker.service - -[Service] -TimeoutStartSec=0 -ExecStartPre=-/usr/bin/docker kill registry2 -ExecStartPre=-/usr/bin/docker rm registry2 -ExecStartPre=/usr/bin/docker pull registry -ExecStart=/usr/bin/docker run -rm --name registry2 -p 5000:5000 -e AWS_KEY="replace-me" -e AWS_SECRET="replace-me" -e SETTINGS_FLAVOR=s3 -e AWS_BUCKET=replace-me -e STORAGE_PATH=/prod registry:0.7.1 -ExecStop=/usr/bin/docker stop registry2 - -[X-Fleet] -X-Conflicts=registry*.service diff --git a/docker-registry-s3/registry.3.service b/docker-registry-s3/registry.3.service deleted file mode 100644 index 8e468f4..0000000 --- a/docker-registry-s3/registry.3.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Custom Docker Registry -After=docker.service - -[Service] -TimeoutStartSec=0 -ExecStartPre=-/usr/bin/docker kill registry3 -ExecStartPre=-/usr/bin/docker rm registry3 -ExecStartPre=/usr/bin/docker pull registry -ExecStart=/usr/bin/docker run -rm --name registry3 -p 5000:5000 -e AWS_KEY="replace-me" -e AWS_SECRET="replace-me" -e SETTINGS_FLAVOR=s3 -e AWS_BUCKET=replace-me -e STORAGE_PATH=/prod registry:0.7.1 -ExecStop=/usr/bin/docker stop registry3 - -[X-Fleet] -X-Conflicts=registry*.service diff --git a/docker-registry-s3/registry@.service b/docker-registry-s3/registry@.service new file mode 100644 index 0000000..d51b349 --- /dev/null +++ b/docker-registry-s3/registry@.service @@ -0,0 +1,22 @@ +[Unit] +Description=Custom Docker Registry +After=docker.service + +[Service] +TimeoutStartSec=0 +ExecStartPre=-/usr/bin/docker kill registry-%i +ExecStartPre=-/usr/bin/docker rm registry-%i +ExecStartPre=/usr/bin/docker pull registry +ExecStart=/usr/bin/docker run -rm \ + --name registry-%i \ + -p 5000:5000 \ + -e AWS_KEY="replace-me" \ + -e AWS_SECRET="replace-me" \ + -e SETTINGS_FLAVOR=s3 \ + -e AWS_BUCKET=replace-me \ + -e STORAGE_PATH=/prod \ + registry:0.7.1 +ExecStop=/usr/bin/docker stop registry-%i + +[X-Fleet] +Conflicts=registry@*.service From d51b4578a95c9dfbb7f6dd730eb35044ca46cb1a Mon Sep 17 00:00:00 2001 From: Emmanuel Gomez Date: Thu, 30 Oct 2014 10:51:47 -0700 Subject: [PATCH 2/2] feat(simple-fleet): convert to template unit. Also convert to new X-Fleet syntax. --- simple-fleet/apache-discovery.2.service | 10 ---------- ...-discovery.1.service => apache-discovery@.service} | 4 ++-- simple-fleet/apache.2.service | 11 ----------- simple-fleet/{apache.1.service => apache@.service} | 2 +- 4 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 simple-fleet/apache-discovery.2.service rename simple-fleet/{apache-discovery.1.service => apache-discovery@.service} (81%) delete mode 100644 simple-fleet/apache.2.service rename simple-fleet/{apache.1.service => apache@.service} (89%) diff --git a/simple-fleet/apache-discovery.2.service b/simple-fleet/apache-discovery.2.service deleted file mode 100644 index 968b5ee..0000000 --- a/simple-fleet/apache-discovery.2.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Announce Apache2 -BindsTo=apache.2.service - -[Service] -ExecStart=/bin/sh -c "while true; do etcdctl set /services/website/apache2 '{ \"host\": \"%H\", \"port\": 80, \"version\": \"52c7248a14\" }' --ttl 60;sleep 45;done" -ExecStop=/usr/bin/etcdctl rm /services/website/apache2 - -[X-Fleet] -X-ConditionMachineOf=apache.2.service diff --git a/simple-fleet/apache-discovery.1.service b/simple-fleet/apache-discovery@.service similarity index 81% rename from simple-fleet/apache-discovery.1.service rename to simple-fleet/apache-discovery@.service index 31e1df8..c8936d7 100644 --- a/simple-fleet/apache-discovery.1.service +++ b/simple-fleet/apache-discovery@.service @@ -1,10 +1,10 @@ [Unit] Description=Announce Apache1 -BindsTo=apache.1.service +BindsTo=apache@%i.service [Service] ExecStart=/bin/sh -c "while true; do etcdctl set /services/website/apache1 '{ \"host\": \"%H\", \"port\": 80, \"version\": \"52c7248a14\" }' --ttl 60;sleep 45;done" ExecStop=/usr/bin/etcdctl rm /services/website/apache1 [X-Fleet] -X-ConditionMachineOf=apache.1.service +MachineOf=apache@%i.service diff --git a/simple-fleet/apache.2.service b/simple-fleet/apache.2.service deleted file mode 100644 index bb00e78..0000000 --- a/simple-fleet/apache.2.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=My Apache Frontend -After=docker.service -Requires=docker.service - -[Service] -ExecStart=/usr/bin/docker run --name apache -p 80:80 coreos/apache /usr/sbin/apache2ctl -D FOREGROUND -ExecStop=/usr/bin/docker stop apache - -[X-Fleet] -X-Conflicts=apache.*.service diff --git a/simple-fleet/apache.1.service b/simple-fleet/apache@.service similarity index 89% rename from simple-fleet/apache.1.service rename to simple-fleet/apache@.service index bb00e78..b103236 100644 --- a/simple-fleet/apache.1.service +++ b/simple-fleet/apache@.service @@ -8,4 +8,4 @@ ExecStart=/usr/bin/docker run --name apache -p 80:80 coreos/apache /usr/sbin/apa ExecStop=/usr/bin/docker stop apache [X-Fleet] -X-Conflicts=apache.*.service +Conflicts=apache@*.service