From e42ed92c3b0f51c6be8d29ba7b56f7c950a5f24b Mon Sep 17 00:00:00 2001 From: Aditya Patawari Date: Mar 28 2015 12:18:32 +0000 Subject: updating to latest master --- diff --git a/fedora-dockerfiles.spec b/fedora-dockerfiles.spec index 62d3e30..3f7fbad 100644 --- a/fedora-dockerfiles.spec +++ b/fedora-dockerfiles.spec @@ -1,10 +1,10 @@ -%global commit 22c4957bf323c5d80d3ca14527210816241580be +%global commit bd5429fd4f00161b41a1dd77b9535d8a94739d9b %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global debug_package %{nil} Name: fedora-dockerfiles Version: 0 -Release: 0.13.git%{shortcommit}%{?dist} +Release: 0.14.git%{shortcommit}%{?dist} Summary: Example dockerfiles to assist standing up containers quickly License: GPLv2 URL: https://github.com/fedora-cloud/Fedora-Dockerfiles.git @@ -25,11 +25,10 @@ stand up test environments using the Docker container engine. %install rm -rf needs_work TODO install -d -p -m 755 %{buildroot}%{_datadir}/%{name} -for d in ansible busybox dhcpd firefox haskell lighttpd \ - mesos owncloud qpid redis ssh apache couchdb \ - Django libvirt mariadb mongodb nginx postgres \ - rabbitmq registry systemd bind cups earthquake \ - hadoop memcached mysql nodejs python squid wordpress; do +for d in ansible busybox dhcpd firefox haskell libvirt mariadb mongodb nginx \ + postgres rabbitmq registry ssh apache couchdb Django flask jenkins \ + memcached mysql nodejs python ruby systemd bind cups earthquake hadoop \ + lapis lighttpd mesos owncloud qpid redis squid wordpress; do if [ -f $d/LICENSE* ] then mv $d/LICENSE* ./LICENSE-$d @@ -42,41 +41,12 @@ done %doc LICENSE-* README.md %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/* -%{_datadir}/%{name}/ansible/* -%{_datadir}/%{name}/ansible/.dockerignore -%{_datadir}/%{name}/busybox/* -%{_datadir}/%{name}/dhcpd/* -%{_datadir}/%{name}/firefox/* -%{_datadir}/%{name}/haskell/* -%{_datadir}/%{name}/lighttpd/* -%{_datadir}/%{name}/mesos/* -%{_datadir}/%{name}/owncloud/* -%{_datadir}/%{name}/qpid/* -%{_datadir}/%{name}/redis/* -%{_datadir}/%{name}/ssh/* -%{_datadir}/%{name}/apache/* -%{_datadir}/%{name}/couchdb/* -%{_datadir}/%{name}/Django/* -%{_datadir}/%{name}/libvirt/* -%{_datadir}/%{name}/mariadb/* -%{_datadir}/%{name}/mongodb/* -%{_datadir}/%{name}/nginx/* -%{_datadir}/%{name}/postgres/* -%{_datadir}/%{name}/rabbitmq/* -%{_datadir}/%{name}/registry/* -%{_datadir}/%{name}/systemd/* -%{_datadir}/%{name}/bind/* -%{_datadir}/%{name}/cups/* -%{_datadir}/%{name}/earthquake/* -%{_datadir}/%{name}/hadoop/* -%{_datadir}/%{name}/memcached/* -%{_datadir}/%{name}/mysql/* -%{_datadir}/%{name}/nodejs/* -%{_datadir}/%{name}/python/* -%{_datadir}/%{name}/squid/* -%{_datadir}/%{name}/wordpress/* +%{_datadir}/%{name}/* %changelog +* Sat Mar 28 2015 Aditya Patawari - 0-0.14.git +- update to master commit: bd5429fd4f00161b41a1dd77b9535d8a94739d9b + * Fri Dec 12 2014 Aditya Patawari - 0-0.13.git - more dockerfiles - fixing the upstream to the official fedora-cloud account diff --git a/sources b/sources index 5b69a21..5e7bb2a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e535f6a11fdcacec6c414afeab50576e Fedora-Dockerfiles-22c4957.tar.gz +348e57827a8bd2e95f62e9990fb71a39 Fedora-Dockerfiles-bd5429f.tar.gz