From b81661dc9461ee89f856ac52d122285c92f8f1e3 Mon Sep 17 00:00:00 2001 From: Andrew Chin Date: Fri, 9 Dec 2016 13:19:37 -0500 Subject: [PATCH] Enable gitlab CI Even though the overviewer repo is hosted on github, this new CI stuff is useful for mirrors of overviewer hosted on gitlab. To support package builds for a few distributions, a set of dockerfiles have been created. --- .gitlab-ci.yml | 184 ++++++++++++++++++ build-tools/dockerfiles/base/Dockerfile | 2 + build-tools/dockerfiles/base/Makefile | 9 + build-tools/dockerfiles/base/README | 3 + .../centos5/Minecraft-Overviewer.spec | 39 ++++ build-tools/dockerfiles/centos6/Dockerfile | 5 + build-tools/dockerfiles/centos6/Makefile | 11 ++ .../centos6/Minecraft-Overviewer.spec | 37 ++++ build-tools/dockerfiles/centos7/Dockerfile | 5 + build-tools/dockerfiles/centos7/Makefile | 11 ++ .../centos7/Minecraft-Overviewer.spec | 37 ++++ build-tools/dockerfiles/debian64/Dockerfile | 2 + build-tools/dockerfiles/debian64/Makefile | 11 ++ build-tools/dockerfiles/debian64/changelog | 5 + build-tools/dockerfiles/debian64/compat | 1 + build-tools/dockerfiles/debian64/control | 13 ++ build-tools/dockerfiles/debian64/copyright | 35 ++++ .../debian64/generate_changelog.sh | 8 + build-tools/dockerfiles/debian64/rules | 9 + .../dockerfiles/debian64/source/format | 1 + build-tools/dockerfiles/src/Dockerfile | 1 + build-tools/dockerfiles/src/Makefile | 5 + build-tools/dockerfiles/src/README | 2 + .../dockerfiles/verify-centos7/Dockerfile | 3 + .../dockerfiles/verify-centos7/Makefile | 11 ++ build-tools/dockerfiles/verify-centos7/README | 1 + .../dockerfiles/verify-debian/Dockerfile | 3 + .../dockerfiles/verify-debian/Makefile | 11 ++ build-tools/dockerfiles/verify-debian/README | 1 + 29 files changed, 466 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 build-tools/dockerfiles/base/Dockerfile create mode 100644 build-tools/dockerfiles/base/Makefile create mode 100644 build-tools/dockerfiles/base/README create mode 100644 build-tools/dockerfiles/centos5/Minecraft-Overviewer.spec create mode 100644 build-tools/dockerfiles/centos6/Dockerfile create mode 100644 build-tools/dockerfiles/centos6/Makefile create mode 100644 build-tools/dockerfiles/centos6/Minecraft-Overviewer.spec create mode 100644 build-tools/dockerfiles/centos7/Dockerfile create mode 100644 build-tools/dockerfiles/centos7/Makefile create mode 100644 build-tools/dockerfiles/centos7/Minecraft-Overviewer.spec create mode 100644 build-tools/dockerfiles/debian64/Dockerfile create mode 100644 build-tools/dockerfiles/debian64/Makefile create mode 100644 build-tools/dockerfiles/debian64/changelog create mode 100644 build-tools/dockerfiles/debian64/compat create mode 100644 build-tools/dockerfiles/debian64/control create mode 100644 build-tools/dockerfiles/debian64/copyright create mode 100644 build-tools/dockerfiles/debian64/generate_changelog.sh create mode 100755 build-tools/dockerfiles/debian64/rules create mode 100644 build-tools/dockerfiles/debian64/source/format create mode 100644 build-tools/dockerfiles/src/Dockerfile create mode 100644 build-tools/dockerfiles/src/Makefile create mode 100644 build-tools/dockerfiles/src/README create mode 100644 build-tools/dockerfiles/verify-centos7/Dockerfile create mode 100644 build-tools/dockerfiles/verify-centos7/Makefile create mode 100644 build-tools/dockerfiles/verify-centos7/README create mode 100644 build-tools/dockerfiles/verify-debian/Dockerfile create mode 100644 build-tools/dockerfiles/verify-debian/Makefile create mode 100644 build-tools/dockerfiles/verify-debian/README diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..0521b43 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,184 @@ +stages: + - build + - test + - package + - verify + - render + +variables: + EXMAPLE_REPO: "https://github.com/overviewer/Minecraft-Overviewer-Addons" + MC_VERSION: "1.11" + +build: + image: code.em32.net:14567/overviewer/minecraft-overviewer:base + stage: build + script: + - python2 setup.py build + - python2 overviewer.py --verbose --version + +build:docs: + image: code.em32.net:14567/overviewer/minecraft-overviewer:base + stage: build + script: + - cd docs + - make + artifacts: + name: "overviewer-docs" + expire_in: 2 weeks + paths: + - docs/_build/html/ + +test: + image: code.em32.net:14567/overviewer/minecraft-overviewer:base + stage: test + dependencies: + - build + script: + - python2 setup.py build + - python2 test/test_all.py + + +# Builds a source package +package:src: + image: code.em32.net:14567/overviewer/minecraft-overviewer:base + stage: package + script: + - python2 setup.py sdist + - ls -lh dist + artifacts: + paths: + - dist/*.tar.gz + +package:centos7rpm: + image: code.em32.net:14567/overviewer/minecraft-overviewer:centos7 + stage: package + script: + - export MCO_VERSION=`python2 setup.py --version` + - echo "Building Minecraft version ${MCO_VERSION}" + - mkdir -p ${HOME}/rpmbuild/SOURCES + - tar --transform 's,^,Minecraft-Overviewer/,S' -czf ${HOME}/rpmbuild/SOURCES/Minecraft-Overviewer-${MCO_VERSION}.tar.gz * + - sed s/{VERSION}/$MCO_VERSION/g build-tools/dockerfiles/centos7/Minecraft-Overviewer.spec > Minecraft-Overviewer.spec + - pwd + - rpmbuild -bs --define 'dist .centos7' Minecraft-Overviewer.spec + - /usr/bin/mock -r centos-7-x86_64 ${HOME}/rpmbuild/SRPMS/Minecraft-Overviewer-${MCO_VERSION}-1.centos7.src.rpm + - cp /var/lib/mock/centos-7-x86_64/result/Minecraft-Overviewer*.x86_64.rpm . + - ls -l *.rpm + artifacts: + expire_in: 2 weeks + paths: + - Minecraft-Overviewer*.x86_64.rpm + +package:centos7-32rpm: + image: code.em32.net:14567/overviewer/minecraft-overviewer:centos7 + stage: package + only: + - master + - triggers + script: + - export MCO_VERSION=`python2 setup.py --version` + - echo "Building Minecraft version ${MCO_VERSION}" + - mkdir -p ${HOME}/rpmbuild/SOURCES + - tar --transform 's,^,Minecraft-Overviewer/,S' -czf ${HOME}/rpmbuild/SOURCES/Minecraft-Overviewer-${MCO_VERSION}.tar.gz * + - sed s/{VERSION}/$MCO_VERSION/g build-tools/dockerfiles/centos7/Minecraft-Overviewer.spec > Minecraft-Overviewer.spec + - pwd + - rpmbuild -bs --define 'dist .centos7' Minecraft-Overviewer.spec + - /usr/bin/mock -r centos-7-i386 ${HOME}/rpmbuild/SRPMS/Minecraft-Overviewer-${MCO_VERSION}-1.centos7.src.rpm + - cp /var/lib/mock/centos-7-i386/result/Minecraft-Overviewer*.i*86.rpm . + - ls -l *.rpm + artifacts: + expire_in: 2 weeks + paths: + - Minecraft-Overviewer*.i*86.rpm + +# Note that even though we are building a centos6 rpm, we can still use the centos7 docker image +package:centos6rpm: + image: code.em32.net:14567/overviewer/minecraft-overviewer:centos7 + stage: package + only: + - master + - triggers + script: + - export MCO_VERSION=`python2 setup.py --version` + - echo "Building Minecraft version ${MCO_VERSION}" + - mkdir -p ${HOME}/rpmbuild/SOURCES + - tar --transform 's,^,Minecraft-Overviewer/,S' -czf ${HOME}/rpmbuild/SOURCES/Minecraft-Overviewer-${MCO_VERSION}.tar.gz * + - sed s/{VERSION}/$MCO_VERSION/g build-tools/dockerfiles/centos6/Minecraft-Overviewer.spec > Minecraft-Overviewer.spec + - pwd + - rpmbuild -bs --define 'dist .centos6' Minecraft-Overviewer.spec + - /usr/bin/mock -r centos-6-x86_64 ${HOME}/rpmbuild/SRPMS/Minecraft-Overviewer-${MCO_VERSION}-1.centos6.src.rpm + - cp /var/lib/mock/centos-6-x86_64/result/Minecraft-Overviewer*.x86_64.rpm . + - ls -l *.rpm + artifacts: + expire_in: 2 weeks + paths: + - Minecraft-Overviewer*.x86_64.rpm + +package:debian64: + image: code.em32.net:14567/overviewer/minecraft-overviewer:debian64 + stage: package + script: + - export MCO_VERSION=`python2 setup.py --version` + - echo "Building Minecraft version ${MCO_VERSION}" + - python setup.py build + - cp -r build-tools/dockerfiles/debian64 debian + - sh debian/generate_changelog.sh > debian/changelog + - cat debian/changelog + - debuild -i -us -uc -b + - mv ../*.deb . + - ls -l *.deb + artifacts: + expire_in: 2 weeks + paths: + - minecraft-overviewer*.deb + + +verify:centos7: + image: code.em32.net:14567/overviewer/minecraft-overviewer:centos7-verify + stage: verify + dependencies: + - package:centos7rpm + script: + - ls -l *.rpm + - ls -l + - echo yum -y install ./Minecraft-Overviewer-0*.rpm + - yum -y install ./Minecraft-Overviewer-0*.rpm + - which overviewer.py + - overviewer.py --verbose --version + - wget -N https://s3.amazonaws.com/Minecraft.Download/versions/${MC_VERSION}/${MC_VERSION}.jar -P ~/.minecraft/versions/${MC_VERSION}/ + - git clone --depth=1 ${EXMAPLE_REPO} maprepo + - overviewer.py --check-terrain --verbose + + +verify:debian64: + image: code.em32.net:14567/overviewer/minecraft-overviewer:debian-verify + stage: verify + dependencies: + - package:debian64 + script: + - dpkg -i ./minecraft-overviewer*.deb || echo "" + - apt-get -y -f install + - which overviewer.py + - overviewer.py --verbose --version + - wget -N https://s3.amazonaws.com/Minecraft.Download/versions/${MC_VERSION}/${MC_VERSION}.jar -P ~/.minecraft/versions/${MC_VERSION}/ + - git clone --depth=1 ${EXMAPLE_REPO} maprepo + - overviewer.py --check-terrain --verbose + + +render: + image: code.em32.net:14567/overviewer/minecraft-overviewer:debian64 + stage: render + tags: + - diax + dependencies: + - package:debian64 + environment: + name: review/$CI_BUILD_REF_NAME + url: http://static-backend.overviewer.org/renders/ci/$CI_BUILD_REF_NAME/$CI_BUILD_ID + script: + - dpkg -i ./minecraft-overviewer*.deb + - wget -N https://s3.amazonaws.com/Minecraft.Download/versions/${MC_VERSION}/${MC_VERSION}.jar -P ~/.minecraft/versions/${MC_VERSION}/ + - git clone --depth=1 ${EXMAPLE_REPO} maprepo + - export RENDER_DIR=/renders/$CI_BUILD_REF_NAME/$CI_BUILD_ID + - mkdir -p $RENDER_DIR + - overviewer.py -p2 --rendermode=smooth_lighting maprepo/exmaple $RENDER_DIR + - "echo Map render now available at: http://static-backend.overviewer.org/renders/ci/$CI_BUILD_REF_NAME/$CI_BUILD_ID" diff --git a/build-tools/dockerfiles/base/Dockerfile b/build-tools/dockerfiles/base/Dockerfile new file mode 100644 index 0000000..73b9a4d --- /dev/null +++ b/build-tools/dockerfiles/base/Dockerfile @@ -0,0 +1,2 @@ +FROM centos:7 +RUN yum -y install git wget python2 @'Development Tools' python-pillow-devel numpy python-sphinx diff --git a/build-tools/dockerfiles/base/Makefile b/build-tools/dockerfiles/base/Makefile new file mode 100644 index 0000000..c1b6dbb --- /dev/null +++ b/build-tools/dockerfiles/base/Makefile @@ -0,0 +1,9 @@ +build: + docker build -t code.em32.net:14567/overviewer/minecraft-overviewer:base . + +push: + docker push code.em32.net:14567/overviewer/minecraft-overviewer:base + +run: + docker run --rm -it code.em32.net:14567/overviewer/minecraft-overviewer:base /bin/bash + diff --git a/build-tools/dockerfiles/base/README b/build-tools/dockerfiles/base/README new file mode 100644 index 0000000..7c44d31 --- /dev/null +++ b/build-tools/dockerfiles/base/README @@ -0,0 +1,3 @@ +This image is a centos:7 image that contains all the necessary tools to build +and run Overviewer. It can serve as a base image for other images, or be used +directly. diff --git a/build-tools/dockerfiles/centos5/Minecraft-Overviewer.spec b/build-tools/dockerfiles/centos5/Minecraft-Overviewer.spec new file mode 100644 index 0000000..9927782 --- /dev/null +++ b/build-tools/dockerfiles/centos5/Minecraft-Overviewer.spec @@ -0,0 +1,39 @@ +%define python_sitearch %{_libdir}/python2.6/site-packages + +Summary: Generates large resolution images of a Minecraft map. +Name: Minecraft-Overviewer +Version: {VERSION} +Release: 1%{?dist} +Source0: %{name}-%{version}.tar.gz +License: GNU General Public License v3 +Group: Development/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Vendor: Andrew Brown +Url: http://overviewer.org/ +Requires: python26, python26-imaging, python26-numpy +BuildRequires: python26-devel, python26-imaging-devel, python26-numpy, python-setuptools + +%description +The Minecraft Overviewer is a command-line tool for rendering high-resolution +maps of Minecraft worlds. It generates a set of static html and image files and +uses the Google Maps API to display a nice interactive map. + +%prep +%setup -n %{name} + +%build +env CFLAGS="$RPM_OPT_FLAGS" %{__python}26 setup.py build + +%install +%{__python}26 setup.py install -O1 --root=%{buildroot} +rm -rf %{buildroot}%{_defaultdocdir}/minecraft-overviewer + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{python_sitearch}/Minecraft_Overviewer-*-*.egg-info +%{python_sitearch}/overviewer_core +%{_bindir}/overviewer.py +%doc README.rst COPYING.txt sample_config.py diff --git a/build-tools/dockerfiles/centos6/Dockerfile b/build-tools/dockerfiles/centos6/Dockerfile new file mode 100644 index 0000000..1f77218 --- /dev/null +++ b/build-tools/dockerfiles/centos6/Dockerfile @@ -0,0 +1,5 @@ +FROM centos:6 +RUN yum -y install epel-release && yum -y install git wget python2 @'Development Tools' python-imaging-devel numpy python-sphinx mock +RUN useradd --create-home --groups mock overviewer +USER overviewer + diff --git a/build-tools/dockerfiles/centos6/Makefile b/build-tools/dockerfiles/centos6/Makefile new file mode 100644 index 0000000..eeda8ad --- /dev/null +++ b/build-tools/dockerfiles/centos6/Makefile @@ -0,0 +1,11 @@ +tag=centos6 + +build: + docker build -t code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) . + +push: + docker push code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) + +run: + docker run --rm --privileged -it code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) /bin/bash + diff --git a/build-tools/dockerfiles/centos6/Minecraft-Overviewer.spec b/build-tools/dockerfiles/centos6/Minecraft-Overviewer.spec new file mode 100644 index 0000000..1bc56b2 --- /dev/null +++ b/build-tools/dockerfiles/centos6/Minecraft-Overviewer.spec @@ -0,0 +1,37 @@ +Summary: Generates large resolution images of a Minecraft map. +Name: Minecraft-Overviewer +Version: {VERSION} +Release: 1%{?dist} +Source0: %{name}-%{version}.tar.gz +License: GNU General Public License v3 +Group: Development/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Vendor: Andrew Brown +Url: http://overviewer.org/ +Requires: python-imaging, numpy +BuildRequires: python-devel, python-imaging-devel, numpy + +%description +The Minecraft Overviewer is a command-line tool for rendering high-resolution +maps of Minecraft worlds. It generates a set of static html and image files and +uses the Google Maps API to display a nice interactive map. + +%prep +%setup -n %{name} + +%build +env CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build + +%install +%{__python} setup.py install -O1 --root=%{buildroot} +rm -rf %{buildroot}%{_defaultdocdir}/minecraft-overviewer + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{python_sitearch}/Minecraft_Overviewer-*-*.egg-info +%{python_sitearch}/overviewer_core +%{_bindir}/overviewer.py +%doc README.rst COPYING.txt sample_config.py diff --git a/build-tools/dockerfiles/centos7/Dockerfile b/build-tools/dockerfiles/centos7/Dockerfile new file mode 100644 index 0000000..80fca44 --- /dev/null +++ b/build-tools/dockerfiles/centos7/Dockerfile @@ -0,0 +1,5 @@ +FROM code.em32.net:14567/overviewer/minecraft-overviewer:base +RUN yum -y install mock +RUN useradd --create-home --groups mock overviewer +USER overviewer + diff --git a/build-tools/dockerfiles/centos7/Makefile b/build-tools/dockerfiles/centos7/Makefile new file mode 100644 index 0000000..6d3f08f --- /dev/null +++ b/build-tools/dockerfiles/centos7/Makefile @@ -0,0 +1,11 @@ +tag=centos7 + +build: + docker build -t code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) . + +push: + docker push code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) + +run: + docker run --rm --privileged -it code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) /bin/bash + diff --git a/build-tools/dockerfiles/centos7/Minecraft-Overviewer.spec b/build-tools/dockerfiles/centos7/Minecraft-Overviewer.spec new file mode 100644 index 0000000..1bc56b2 --- /dev/null +++ b/build-tools/dockerfiles/centos7/Minecraft-Overviewer.spec @@ -0,0 +1,37 @@ +Summary: Generates large resolution images of a Minecraft map. +Name: Minecraft-Overviewer +Version: {VERSION} +Release: 1%{?dist} +Source0: %{name}-%{version}.tar.gz +License: GNU General Public License v3 +Group: Development/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Vendor: Andrew Brown +Url: http://overviewer.org/ +Requires: python-imaging, numpy +BuildRequires: python-devel, python-imaging-devel, numpy + +%description +The Minecraft Overviewer is a command-line tool for rendering high-resolution +maps of Minecraft worlds. It generates a set of static html and image files and +uses the Google Maps API to display a nice interactive map. + +%prep +%setup -n %{name} + +%build +env CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build + +%install +%{__python} setup.py install -O1 --root=%{buildroot} +rm -rf %{buildroot}%{_defaultdocdir}/minecraft-overviewer + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{python_sitearch}/Minecraft_Overviewer-*-*.egg-info +%{python_sitearch}/overviewer_core +%{_bindir}/overviewer.py +%doc README.rst COPYING.txt sample_config.py diff --git a/build-tools/dockerfiles/debian64/Dockerfile b/build-tools/dockerfiles/debian64/Dockerfile new file mode 100644 index 0000000..14fd1e1 --- /dev/null +++ b/build-tools/dockerfiles/debian64/Dockerfile @@ -0,0 +1,2 @@ +FROM debian:jessie +RUN apt-get -y update && apt-get -y install git build-essential python-numpy python-pil python-dev python-imaging python-all-dev devscripts wget diff --git a/build-tools/dockerfiles/debian64/Makefile b/build-tools/dockerfiles/debian64/Makefile new file mode 100644 index 0000000..cb3f628 --- /dev/null +++ b/build-tools/dockerfiles/debian64/Makefile @@ -0,0 +1,11 @@ +tag=debian64 + +build: + docker build -t code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) . + +push: + docker push code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) + +run: + docker run --rm --privileged -it code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) /bin/bash + diff --git a/build-tools/dockerfiles/debian64/changelog b/build-tools/dockerfiles/debian64/changelog new file mode 100644 index 0000000..ccf09d5 --- /dev/null +++ b/build-tools/dockerfiles/debian64/changelog @@ -0,0 +1,5 @@ +minecraft-overviewer ({VERSION}-0~overviewer1) unstable; urgency=low + + * Automatically generated from Git: {DESC} + + -- Aaron Griffith {DATE} diff --git a/build-tools/dockerfiles/debian64/compat b/build-tools/dockerfiles/debian64/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/build-tools/dockerfiles/debian64/compat @@ -0,0 +1 @@ +7 diff --git a/build-tools/dockerfiles/debian64/control b/build-tools/dockerfiles/debian64/control new file mode 100644 index 0000000..2103e51 --- /dev/null +++ b/build-tools/dockerfiles/debian64/control @@ -0,0 +1,13 @@ +Source: minecraft-overviewer +Maintainer: Aaron Griffith +Section: python +Priority: optional +Build-Depends: python-all-dev (>= 2.6), debhelper (>= 7.4.3), python-imaging, python-numpy +Standards-Version: 3.9.1 + +Package: minecraft-overviewer +Architecture: any +Homepage: http://overviewer.org/ +XB-Python-Version: ${python:Versions} +Depends: ${misc:Depends}, python2.7 | python2.6, python (>= 2.6), python (<< 2.8), python-imaging, python-numpy, ${shlibs:Depends} +Description: Generates large resolution images of a Minecraft map. diff --git a/build-tools/dockerfiles/debian64/copyright b/build-tools/dockerfiles/debian64/copyright new file mode 100644 index 0000000..461e69f --- /dev/null +++ b/build-tools/dockerfiles/debian64/copyright @@ -0,0 +1,35 @@ +This package was debianized by Aaron Griffith + on Sat, 14 May 2011 14:21:24 -0400. + +It was downloaded from http://github.com/overviewer/Minecraft-Overviewer + +Upstream Author: + + Andrew Brown + +Files: * +Copyright: + 2010-2011, Andrew Brown +License: GPL + +Files: debian/* +Copyright: + 2011, Aaron Griffith +License: GPL + +License: GPL + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, see . + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-3' diff --git a/build-tools/dockerfiles/debian64/generate_changelog.sh b/build-tools/dockerfiles/debian64/generate_changelog.sh new file mode 100644 index 0000000..c5694fc --- /dev/null +++ b/build-tools/dockerfiles/debian64/generate_changelog.sh @@ -0,0 +1,8 @@ +NOW=`date '+%a, %d %b %Y %H:%M:%S +0000'` +VER=`python2 setup.py --version` +DESC=`git describe --tags` +echo "minecraft-overviewer (${VER}-0~overviewer1) unstable; urgency=low" +echo "" +echo " * Automatically generated from Git: ${DESC}" +echo "" +echo " -- Aaron Griffith ${NOW}" diff --git a/build-tools/dockerfiles/debian64/rules b/build-tools/dockerfiles/debian64/rules new file mode 100755 index 0000000..1c4e8d0 --- /dev/null +++ b/build-tools/dockerfiles/debian64/rules @@ -0,0 +1,9 @@ +#!/usr/bin/make -f + +# This file was automatically generated by stdeb 0.6.0+git at +# Tue, 18 Sep 2012 22:13:53 -0400 + +%: + dh $@ --with python2 --buildsystem=python_distutils + + diff --git a/build-tools/dockerfiles/debian64/source/format b/build-tools/dockerfiles/debian64/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/build-tools/dockerfiles/debian64/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/build-tools/dockerfiles/src/Dockerfile b/build-tools/dockerfiles/src/Dockerfile new file mode 100644 index 0000000..b24bf05 --- /dev/null +++ b/build-tools/dockerfiles/src/Dockerfile @@ -0,0 +1 @@ +FROM code.em32.net:14567/overviewer/minecraft-overviewer diff --git a/build-tools/dockerfiles/src/Makefile b/build-tools/dockerfiles/src/Makefile new file mode 100644 index 0000000..2527504 --- /dev/null +++ b/build-tools/dockerfiles/src/Makefile @@ -0,0 +1,5 @@ +all: + docker build -t overviewer:src . + +run: + docker run --rm -it overviewer:src /bin/bash diff --git a/build-tools/dockerfiles/src/README b/build-tools/dockerfiles/src/README new file mode 100644 index 0000000..e7de1c1 --- /dev/null +++ b/build-tools/dockerfiles/src/README @@ -0,0 +1,2 @@ +This is an image that builds a image that can be used to generate an overviewer +source package diff --git a/build-tools/dockerfiles/verify-centos7/Dockerfile b/build-tools/dockerfiles/verify-centos7/Dockerfile new file mode 100644 index 0000000..8c0fd59 --- /dev/null +++ b/build-tools/dockerfiles/verify-centos7/Dockerfile @@ -0,0 +1,3 @@ +FROM centos:7 +RUN yum -y install git wget which + diff --git a/build-tools/dockerfiles/verify-centos7/Makefile b/build-tools/dockerfiles/verify-centos7/Makefile new file mode 100644 index 0000000..e20b9ef --- /dev/null +++ b/build-tools/dockerfiles/verify-centos7/Makefile @@ -0,0 +1,11 @@ +tag=centos7-verify + +build: + docker build -t code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) . + +push: + docker push code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) + +run: + docker run --rm -it code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) /bin/bash + diff --git a/build-tools/dockerfiles/verify-centos7/README b/build-tools/dockerfiles/verify-centos7/README new file mode 100644 index 0000000..edefd8e --- /dev/null +++ b/build-tools/dockerfiles/verify-centos7/README @@ -0,0 +1 @@ +This dockerfile is a very basic image that we use to verify that centos RPMs can be installed diff --git a/build-tools/dockerfiles/verify-debian/Dockerfile b/build-tools/dockerfiles/verify-debian/Dockerfile new file mode 100644 index 0000000..53a8b77 --- /dev/null +++ b/build-tools/dockerfiles/verify-debian/Dockerfile @@ -0,0 +1,3 @@ +FROM debian:jessie +RUN apt-get -y update && apt-get -y install wget git + diff --git a/build-tools/dockerfiles/verify-debian/Makefile b/build-tools/dockerfiles/verify-debian/Makefile new file mode 100644 index 0000000..f528643 --- /dev/null +++ b/build-tools/dockerfiles/verify-debian/Makefile @@ -0,0 +1,11 @@ +tag=debian-verify + +build: + docker build -t code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) . + +push: + docker push code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) + +run: + docker run --rm -it code.em32.net:14567/overviewer/minecraft-overviewer:$(tag) /bin/bash + diff --git a/build-tools/dockerfiles/verify-debian/README b/build-tools/dockerfiles/verify-debian/README new file mode 100644 index 0000000..9296c97 --- /dev/null +++ b/build-tools/dockerfiles/verify-debian/README @@ -0,0 +1 @@ +This dockerfile is a very basic image that we use to verify that debian .deb files can be installed