diff --git a/.packer.json b/.packer.json index 2f637dd70270902f256ec9b2f7615d692f9561cf..d594935551fe1a70b2d6f75be06ab3f96067b9d5 100644 --- a/.packer.json +++ b/.packer.json @@ -1,28 +1,6 @@ { "BuildType" : "Docker", "BuildInstructions" : { - "fedora_21" : [ - "mkdir -p /sources", - "cd /ring-daemon", - "cp ring-daemon.spec ..", - "git archive --format=tar --prefix=ring-daemon/ -o /sources/daemon origin/master", - "cd ..", - "sed -i 's/define release .*/define release {{RELEASE_NUMBER}}/g' ring-daemon.spec", - "sed -i 's/%setup -q/%setup -n ring-daemon/' ring-daemon.spec", - "rpmbuild -ba ring-daemon.spec --define \"_sourcedir /sources\"", - "cp -R /root/rpmbuild/RPMS/x86_64/* /output" - ], - "fedora_21_i386" : [ - "mkdir -p /sources", - "cd /ring-daemon", - "cp ring-daemon.spec ..", - "git archive --format=tar --prefix=ring-daemon/ -o /sources/daemon origin/master", - "cd ..", - "sed -i 's/define release .*/define release {{RELEASE_NUMBER}}/g' ring-daemon.spec", - "sed -i 's/%setup -q/%setup -n ring-daemon/' ring-daemon.spec", - "rpmbuild -ba ring-daemon.spec --define \"_sourcedir /sources\"", - "cp -R /root/rpmbuild/RPMS/i686/* /output" - ], "fedora_22": [ "mkdir -p /sources", "cd /ring-daemon", @@ -95,26 +73,6 @@ "cd .. ", "mv *.orig.tar* *.debian.tar* *deb *changes *dsc /output" ], - "ubuntu_15.04": [ - "mkdir -p /sources/ring-daemon", - "cd /sources/ring-daemon", - "/ring-daemon/debian/rules get-orig-source", - "dch --newversion $(dpkg-parsechangelog | perl -ne 'print $1 if m{^Version:\\s+([\\d\\.]+)};')-{{RELEASE_NUMBER}} \"Automatic nightly release\"", - "dch --release --distribution \"unstable\" debian/changelog", - "dpkg-buildpackage -uc -us", - "cd .. ", - "mv *.orig.tar* *.debian.tar* *deb *changes *dsc /output" - ], - "ubuntu_15.04_i386": [ - "mkdir -p /sources/ring-daemon", - "cd /sources/ring-daemon", - "/ring-daemon/debian/rules get-orig-source", - "dch --newversion $(dpkg-parsechangelog | perl -ne 'print $1 if m{^Version:\\s+([\\d\\.]+)};')-{{RELEASE_NUMBER}} \"Automatic nightly release\"", - "dch --release --distribution \"unstable\" debian/changelog", - "dpkg-buildpackage -uc -us", - "cd .. ", - "mv *.orig.tar* *.debian.tar* *deb *changes *dsc /output" - ], "ubuntu_15.10": [ "mkdir -p /sources/ring-daemon", "cd /sources/ring-daemon", @@ -137,35 +95,27 @@ ] }, "UpdateInstructions" : { - "fedora_21" : ["yum upgrade -y"], - "fedora_21_i386" : ["yum upgrade -y"], "fedora_22": ["yum upgrade -y"], "fedora_23": ["dnf upgrade -y"], "debian_8": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"], "debian_8_i386": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"], "debian_9": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"], "ubuntu_14.04": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"], - "ubuntu_15.04": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"], "ubuntu_14.04_i386": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"], - "ubuntu_15.04_i386": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"], "ubuntu_15.10": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"], "ubuntu_15.10_i386": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"] }, "ReviewType": "", "ReviewAddress": "https://gerrit-ring.savoirfairelinux.com", "Package" : { - "fedora_21" : "", - "fedora_21_i386" : "", "fedora_22": "", "fedora_23": "", "debian_8": "", "debian_8_i386": "", "debian_9": "", "ubuntu_14.04": "", - "ubuntu_15.04": "", - "ubuntu_15.10": "", "ubuntu_14.04_i386": "", - "ubuntu_15.04_i386": "", + "ubuntu_15.10": "", "ubuntu_15.10_i386": "" }, "ReloadProjectCmd" : [ @@ -174,18 +124,14 @@ "git pull" ], "AutoDeploySchedule": { - "fedora_21" : "0 0 0 * * THU", - "fedora_21_i386" : "0 0 0 * * THU", "fedora_22": "0 0 0 * * THU", "fedora_23": "0 0 0 * * THU", "debian_8": "0 0 0 * * THU", "debian_8_i386": "0 0 0 * * THU", "debian_9": "0 0 0 * * THU", "ubuntu_14.04": "0 0 0 * * THU", - "ubuntu_15.04": "0 0 0 * * THU", - "ubuntu_15.10": "0 0 0 * * THU", "ubuntu_14.04_i386": "0 0 0 * * THU", - "ubuntu_15.04_i386": "0 0 0 * * THU", + "ubuntu_15.10": "0 0 0 * * THU", "ubuntu_15.10_i386": "0 0 0 * * THU" }, "DeployScript": "ring-nightly-sign-deploy.sh", diff --git a/docker/fedora_21/Dockerfile b/docker/fedora_21/Dockerfile deleted file mode 100644 index 8145f5581defc3225d2d0830b4ae4fa9487bb9a5..0000000000000000000000000000000000000000 --- a/docker/fedora_21/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM fedora:21 - -RUN yum upgrade -y -RUN yum install rpm-build tar rsync git make autoconf automake cmake speexdsp-devel pulseaudio-libs-devel \ - libsamplerate-devel libtool dbus-devel expat-devel pcre-devel yaml-cpp-devel boost-devel dbus-c++-devel dbus-devel \ - libsndfile-devel libsrtp-devel libXext-devel libXfixes-devel yasm git speex-devel chrpath check astyle uuid-c++-devel \ - gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel uuid-devel gnutls-devel nettle-devel opus-devel -y diff --git a/docker/fedora_21_i386/Dockerfile b/docker/fedora_21_i386/Dockerfile deleted file mode 100644 index 55c4e192adbf2ce2d0c225b5ecafc0a094688c03..0000000000000000000000000000000000000000 --- a/docker/fedora_21_i386/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM savoirfairelinux/ring-fedora32:21 - -RUN yum upgrade -y -RUN yum install rpm-build tar rsync git make autoconf automake cmake speexdsp-devel pulseaudio-libs-devel \ - libsamplerate-devel libtool dbus-devel expat-devel pcre-devel yaml-cpp-devel boost-devel dbus-c++-devel dbus-devel \ - libsndfile-devel libsrtp-devel libXext-devel libXfixes-devel yasm git speex-devel chrpath check astyle uuid-c++-devel \ - gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel uuid-devel gnutls-devel nettle-devel opus-devel -y diff --git a/docker/ubuntu_15.04/Dockerfile b/docker/ubuntu_15.04/Dockerfile deleted file mode 100644 index 0092fc82614301e779d60c675ca9ce00355fa200..0000000000000000000000000000000000000000 --- a/docker/ubuntu_15.04/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM ubuntu:15.04 - -RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y ) -RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git \ - autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \ - libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \ - libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \ - libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \ - libspeexdsp-dev autotools-dev chrpath check astyle \ - uuid-dev libudev-dev cmake --fix-missing diff --git a/docker/ubuntu_15.04_i386/Dockerfile b/docker/ubuntu_15.04_i386/Dockerfile deleted file mode 100644 index 5437090d05062d01d452f8c251c0fd40fbd5ad39..0000000000000000000000000000000000000000 --- a/docker/ubuntu_15.04_i386/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM savoirfairelinux/ring-ubuntu32:15.04 - -RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y ) -RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git \ - autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \ - libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \ - libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \ - libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \ - libspeexdsp-dev autotools-dev chrpath check astyle \ - uuid-dev libudev-dev cmake --fix-missing