From 9eb6d8a938e5040966b35f045cce0ad2c17a2137 Mon Sep 17 00:00:00 2001 From: Denis Silakov Date: Thu, 21 Sep 2017 12:49:55 +0300 Subject: [PATCH] Clean repo, upload tarball --- .abf.yml | 4 ++-- README.docker-logrotate | 17 ----------------- docker-logrotate.sh | 11 ----------- docker-network.sysconfig | 3 --- docker-storage.sysconfig | 14 -------------- docker.service | 27 --------------------------- docker.socket | 12 ------------ docker.spec | 15 ++------------- docker.sysconfig | 22 ---------------------- 9 files changed, 4 insertions(+), 121 deletions(-) delete mode 100644 README.docker-logrotate delete mode 100755 docker-logrotate.sh delete mode 100644 docker-network.sysconfig delete mode 100644 docker-storage.sysconfig delete mode 100644 docker.service delete mode 100644 docker.socket delete mode 100644 docker.sysconfig diff --git a/.abf.yml b/.abf.yml index a1051d0..472650d 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,3 @@ sources: - v1.6.2.tar.gz: 030c87e48835e6fcb54c44d6ba250c1764bcda1a - libnetwork-20170523.tar.xz: 1d6cfa291a9ed3b83fa9d5a35f3ae5064716a0ab \ No newline at end of file + libnetwork-20170523.tar.xz: 1d6cfa291a9ed3b83fa9d5a35f3ae5064716a0ab + v17.05.0-ce.tar.gz: 809551f715da02f40f6c8c7b25ef19717da3b2aa diff --git a/README.docker-logrotate b/README.docker-logrotate deleted file mode 100644 index e142ad1..0000000 --- a/README.docker-logrotate +++ /dev/null @@ -1,17 +0,0 @@ -This package will install the 'docker-logrotate' script to -/etc/cron.daily. This script will run logrotate on all running -containers and ignore all failures. - -This script is enabled by default. To disable it, -uncomment the line "LOGROTATE=false" in /etc/sysconfig/docker. - -Possible issues: -1. This assumes that logrotate is installed on containers to run -successfully. - -2. A race condition occurs if a container exits before 'docker -exec' run (though it's ignored) - -3. Not all containers may need this (whether logrotate is installed or not) - -Suggestions to improve this are welcome. diff --git a/docker-logrotate.sh b/docker-logrotate.sh deleted file mode 100755 index 27fb979..0000000 --- a/docker-logrotate.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -LOGROTATE=true -[ -f /etc/sysconfig/docker ] && source /etc/sysconfig/docker - -if [ $LOGROTATE == true ]; then - for id in $(docker ps -q); do - exec $(docker exec $id logrotate -s /var/log/logstatus /etc/logrotate.conf > /dev/null 2&>1) - done -fi -exit 0 diff --git a/docker-network.sysconfig b/docker-network.sysconfig deleted file mode 100644 index b82627c..0000000 --- a/docker-network.sysconfig +++ /dev/null @@ -1,3 +0,0 @@ -# /etc/sysconfig/docker-network -# It's convenient to have docker listening on a tcp port so add it -DOCKER_NETWORK_OPTIONS=-H unix://var/run/docker.sock -H tcp://127.0.0.1:2375 diff --git a/docker-storage.sysconfig b/docker-storage.sysconfig deleted file mode 100644 index d92fac7..0000000 --- a/docker-storage.sysconfig +++ /dev/null @@ -1,14 +0,0 @@ -# This file may be automatically generated by an installation program. - -# By default, Docker uses a loopback-mounted sparse file in -# /var/lib/docker. The loopback makes it slower, and there are some -# restrictive defaults, such as 100GB max storage. - -# If your installation did not set a custom storage for Docker, you -# may do it below. - -# Example: Use a custom pair of raw logical volumes (one for metadata, -# one for data). -# DOCKER_STORAGE_OPTIONS = --storage-opt dm.metadatadev=/dev/mylogvol/my-docker-metadata --storage-opt dm.datadev=/dev/mylogvol/my-docker-data - -DOCKER_STORAGE_OPTIONS=-g /var/cache/docker diff --git a/docker.service b/docker.service deleted file mode 100644 index e1f08f2..0000000 --- a/docker.service +++ /dev/null @@ -1,27 +0,0 @@ -[Unit] -Description=Docker Application Container Engine -Documentation=http://docs.docker.com -After=network.target -Wants=docker-storage-setup.service - -[Service] -Type=notify -EnvironmentFile=-/etc/sysconfig/docker -EnvironmentFile=-/etc/sysconfig/docker-storage -EnvironmentFile=-/etc/sysconfig/docker-network -Environment=GOTRACEBACK=crash -ExecStart=/usr/bin/dockerd \ - $OPTIONS \ - $DOCKER_STORAGE_OPTIONS \ - $DOCKER_NETWORK_OPTIONS \ - $INSECURE_REGISTRY -LimitNOFILE=1048576 -LimitNPROC=1048576 -LimitCORE=infinity -MountFlags=slave -ExecStartPre=rm -f /etc/sysconfig/network-scripts/ifcfg-*veth* -ExecStopPost=rm -f /etc/sysconfig/network-scripts/ifcfg-*veth* - -[Install] -WantedBy=multi-user.target - diff --git a/docker.socket b/docker.socket deleted file mode 100644 index 7dd9509..0000000 --- a/docker.socket +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Docker Socket for the API -PartOf=docker.service - -[Socket] -ListenStream=/var/run/docker.sock -SocketMode=0660 -SocketUser=root -SocketGroup=docker - -[Install] -WantedBy=sockets.target diff --git a/docker.spec b/docker.spec index 6befa72..05c20ec 100644 --- a/docker.spec +++ b/docker.spec @@ -28,7 +28,7 @@ Name: docker Version: %{dist_version} -Release: 3 +Release: 4 Summary: Automates deployment of containerized applications License: ASL 2.0 Group: System/Kernel and hardware @@ -37,16 +37,6 @@ URL: http://www.docker.com # only x86_64 for now: https://github.com/docker/docker/issues/136 #ExclusiveArch: x86_64 Source0: https://%{import_path}/archive/v%{dist_version}-ce.tar.gz -#Source0: https://%{import_path}/archive/%{commit}.tar.gzS - -#Source1: %{repo}.service -#Source2: %{repo}.sysconfig -#Source3: %{repo}-storage.sysconfig -#Source4: %{repo}-logrotate.sh -#Source5: README.%{repo}-logrotate -#Source6: %{repo}-network.sysconfig -#Source7: %{repo}.socket - Source2: docker.conf Source3: libnetwork-20170523.tar.xz Patch0: adjust-docker-service.patch @@ -60,7 +50,6 @@ BuildRequires: golang >= 1.4 BuildRequires: pkgconfig(sqlite3) Requires: runc -# Requires: containerd BuildRequires: golang-net-devel BuildRequires: go-md2man @@ -71,7 +60,7 @@ BuildRequires: pkgconfig(libsystemd) Requires: systemd-units # With docker >= 1.11 you now need containerd (and runC as a dep) -Requires: docker-containerd +Requires: docker-containerd >= 0.2.5 # need xz to work with ubuntu images # https://bugzilla.redhat.com/show_bug.cgi?id=1045220 diff --git a/docker.sysconfig b/docker.sysconfig deleted file mode 100644 index 9813b64..0000000 --- a/docker.sysconfig +++ /dev/null @@ -1,22 +0,0 @@ -# /etc/sysconfig/docker - -# Modify these options if you want to change the way the docker daemon runs -OPTIONS='' -DOCKER_CERT_PATH=/etc/docker - -# Enable insecure registry communication by appending the registry URL -# to the INSECURE_REGISTRY variable below and uncommenting it -# INSECURE_REGISTRY='--insecure-registry ' - -# On SELinux System, if you remove the --selinux-enabled option, you -# also need to turn on the docker_transition_unconfined boolean. -# setsebool -P docker_transition_unconfined - -# Location used for temporary files, such as those created by -# docker load and build operations. Default is /var/lib/docker/tmp -# Can be overriden by setting the following environment variable. -# DOCKER_TMPDIR=/var/tmp - -# Controls the /etc/cron.daily/docker-logrotate cron job status. -# To disable, uncomment the line below. -# LOGROTATE=false