github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Base etcd-empty-dir-cleanup on busybox, run as nobody, and update to etcdctl 3.0.14

Browse Source
This commit is contained in:
Jeff Grafton 2017-02-17 15:03:17 -08:00
parent 2e12711160
commit 1f3ba7f484
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cluster/images/etcd-empty-dir-cleanup/Dockerfile
View File

@ -12,12 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM gliderlabs/alpine
FROM busybox
COPY etcdctl etcd-empty-dir-cleanup.sh /
RUN chmod a+rx /etcdctl /etcd-empty-dir-cleanup.sh
RUN apk-install bash
ADD etcd-empty-dir-cleanup.sh etcd-empty-dir-cleanup.sh
ADD etcdctl etcdctl
ENV ETCDCTL /etcdctl
ENV SLEEP_SECOND 3600
RUN chmod +x etcd-empty-dir-cleanup.sh
CMD bash /etcd-empty-dir-cleanup.sh
USER nobody:nogroup
ENTRYPOINT ["/etcd-empty-dir-cleanup.sh"]

6
cluster/images/etcd-empty-dir-cleanup/Makefile
View File

@ -14,9 +14,9 @@
.PHONY: build push
ETCD_VERSION = 2.2.1
IMAGE = gcr.io/google_containers/etcd-empty-dir-cleanup
TAG = 0.0.1
ETCD_VERSION = 3.0.14
IMAGE = gcr.io/google-containers/etcd-empty-dir-cleanup
TAG = 3.0.14.0
clean:
rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz

6
cluster/images/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh
# Copyright 2016 The Kubernetes Authors.
#
@ -17,7 +17,7 @@
echo "Removing empty directories from etcd..."
cleanup_empty_dirs () {
if [[ $(${ETCDCTL} ls $1) ]]; then
if [ "$(${ETCDCTL} ls $1)" ]; then
for SUBDIR in $(${ETCDCTL} ls -p $1 | grep "/$")
do
cleanup_empty_dirs ${SUBDIR}
@ -34,4 +34,4 @@ do
cleanup_empty_dirs "/registry"
echo "Done with cleanup."
sleep ${SLEEP_SECOND}
done
done