8
.dockerignore
Normal file
8
.dockerignore
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
*Dockerfile
|
||||||
|
.dockerignore
|
||||||
|
.git
|
||||||
|
.vagrant
|
||||||
|
contrib
|
||||||
|
docs
|
||||||
|
tests
|
||||||
|
!contrib/dokku-installer.py
|
||||||
6
Makefile
6
Makefile
@@ -1,4 +1,4 @@
|
|||||||
DOKKU_VERSION = master
|
DOKKU_VERSION ?= master
|
||||||
|
|
||||||
SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.6.0/sshcommand
|
SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.6.0/sshcommand
|
||||||
PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v0.2.2/plugn_0.2.2_linux_x86_64.tgz
|
PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v0.2.2/plugn_0.2.2_linux_x86_64.tgz
|
||||||
@@ -76,7 +76,11 @@ addman: help2man man-db
|
|||||||
mandb
|
mandb
|
||||||
|
|
||||||
version:
|
version:
|
||||||
|
ifeq ($(DOKKU_VERSION),master)
|
||||||
git describe --tags > ~dokku/VERSION 2> /dev/null || echo '~${DOKKU_VERSION} ($(shell date -uIminutes))' > ~dokku/VERSION
|
git describe --tags > ~dokku/VERSION 2> /dev/null || echo '~${DOKKU_VERSION} ($(shell date -uIminutes))' > ~dokku/VERSION
|
||||||
|
else
|
||||||
|
echo $(DOKKU_VERSION) > ~dokku/VERSION
|
||||||
|
endif
|
||||||
|
|
||||||
plugin-dependencies: plugn
|
plugin-dependencies: plugn
|
||||||
sudo -E dokku plugin:install-dependencies --core
|
sudo -E dokku plugin:install-dependencies --core
|
||||||
|
|||||||
4
arch.mk
4
arch.mk
@@ -22,7 +22,11 @@ arch-setup:
|
|||||||
|
|
||||||
arch-dokku: arch-setup
|
arch-dokku: arch-setup
|
||||||
echo "-> Update package sums, create metadata file and test the build of the package"
|
echo "-> Update package sums, create metadata file and test the build of the package"
|
||||||
|
ifeq ($(DOKKU_VERSION),master)
|
||||||
git describe --tags > /tmp/VERSION
|
git describe --tags > /tmp/VERSION
|
||||||
|
else
|
||||||
|
echo $(DOKKU_VERSION) > /tmp/VERSION
|
||||||
|
endif
|
||||||
cat /tmp/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/STABLE_VERSION
|
cat /tmp/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/STABLE_VERSION
|
||||||
sed -i -e "s/pkgver=.*/pkgver=`cat /tmp/STABLE_VERSION`/" /dokku-arch/PKGBUILD
|
sed -i -e "s/pkgver=.*/pkgver=`cat /tmp/STABLE_VERSION`/" /dokku-arch/PKGBUILD
|
||||||
cd /dokku-arch; updpkgsums; mksrcinfo; makepkg -fd
|
cd /dokku-arch; updpkgsums; mksrcinfo; makepkg -fd
|
||||||
|
|||||||
34
contrib/build-centos.Dockerfile
Normal file
34
contrib/build-centos.Dockerfile
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
FROM ubuntu:14.04
|
||||||
|
|
||||||
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
|
RUN apt-get update
|
||||||
|
|
||||||
|
RUN apt-get -qq -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db
|
||||||
|
|
||||||
|
RUN command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
|
||||||
|
|
||||||
|
WORKDIR /dokku
|
||||||
|
|
||||||
|
COPY Makefile /dokku/
|
||||||
|
|
||||||
|
COPY *.mk /dokku/
|
||||||
|
|
||||||
|
RUN make deb-setup rpm-setup
|
||||||
|
|
||||||
|
COPY . /dokku
|
||||||
|
|
||||||
|
RUN make sshcommand plugn version copyfiles
|
||||||
|
|
||||||
|
ARG DOKKU_VERSION=master
|
||||||
|
ENV DOKKU_VERSION ${DOKKU_VERSION}
|
||||||
|
|
||||||
|
ARG DOKKU_GIT_REV
|
||||||
|
ENV DOKKU_GIT_REV ${DOKKU_GIT_REV}
|
||||||
|
|
||||||
|
ARG IS_RELEASE=false
|
||||||
|
ENV IS_RELEASE ${IS_RELEASE}
|
||||||
|
|
||||||
|
RUN make rpm-herokuish rpm-dokku rpm-plugn rpm-sshcommand rpm-sigil
|
||||||
|
|
||||||
|
RUN mkdir -p /data && cp /tmp/*.rpm /data && ls /data/
|
||||||
34
contrib/build-ubuntu.Dockerfile
Normal file
34
contrib/build-ubuntu.Dockerfile
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
FROM ubuntu:14.04
|
||||||
|
|
||||||
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
|
RUN apt-get update
|
||||||
|
|
||||||
|
RUN apt-get -qq -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db
|
||||||
|
|
||||||
|
RUN command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
|
||||||
|
|
||||||
|
WORKDIR /dokku
|
||||||
|
|
||||||
|
COPY Makefile /dokku/
|
||||||
|
|
||||||
|
COPY *.mk /dokku/
|
||||||
|
|
||||||
|
RUN make deb-setup rpm-setup
|
||||||
|
|
||||||
|
COPY . /dokku
|
||||||
|
|
||||||
|
RUN make sshcommand plugn version copyfiles
|
||||||
|
|
||||||
|
ARG DOKKU_VERSION=master
|
||||||
|
ENV DOKKU_VERSION ${DOKKU_VERSION}
|
||||||
|
|
||||||
|
ARG DOKKU_GIT_REV
|
||||||
|
ENV DOKKU_GIT_REV ${DOKKU_GIT_REV}
|
||||||
|
|
||||||
|
ARG IS_RELEASE=false
|
||||||
|
ENV IS_RELEASE ${IS_RELEASE}
|
||||||
|
|
||||||
|
RUN make deb-herokuish deb-dokku deb-plugn deb-sshcommand deb-sigil
|
||||||
|
|
||||||
|
RUN mkdir -p /data && cp /tmp/*.deb /data && ls /data/
|
||||||
8
deb.mk
8
deb.mk
@@ -128,14 +128,22 @@ deb-dokku:
|
|||||||
cp /usr/local/share/man/man1/dokku.1 /tmp/build/usr/share/man/man1/dokku.1
|
cp /usr/local/share/man/man1/dokku.1 /tmp/build/usr/share/man/man1/dokku.1
|
||||||
gzip -9 /tmp/build/usr/share/man/man1/dokku.1
|
gzip -9 /tmp/build/usr/share/man/man1/dokku.1
|
||||||
cp contrib/dokku-installer.py /tmp/build/usr/share/dokku/contrib
|
cp contrib/dokku-installer.py /tmp/build/usr/share/dokku/contrib
|
||||||
|
ifeq ($(DOKKU_VERSION),master)
|
||||||
git describe --tags > /tmp/build/var/lib/dokku/VERSION
|
git describe --tags > /tmp/build/var/lib/dokku/VERSION
|
||||||
|
else
|
||||||
|
echo $(DOKKU_VERSION) > /tmp/build/var/lib/dokku/VERSION
|
||||||
|
endif
|
||||||
cat /tmp/build/var/lib/dokku/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/build/var/lib/dokku/STABLE_VERSION
|
cat /tmp/build/var/lib/dokku/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/build/var/lib/dokku/STABLE_VERSION
|
||||||
ifneq (,$(findstring false,$(IS_RELEASE)))
|
ifneq (,$(findstring false,$(IS_RELEASE)))
|
||||||
sed -i.bak -e "s/^/`date +%s`:/" /tmp/build/var/lib/dokku/STABLE_VERSION && rm /tmp/build/var/lib/dokku/STABLE_VERSION.bak
|
sed -i.bak -e "s/^/`date +%s`:/" /tmp/build/var/lib/dokku/STABLE_VERSION && rm /tmp/build/var/lib/dokku/STABLE_VERSION.bak
|
||||||
endif
|
endif
|
||||||
rm /tmp/build/DEBIAN/lintian-overrides
|
rm /tmp/build/DEBIAN/lintian-overrides
|
||||||
mv debian/lintian-overrides /tmp/build/usr/share/lintian/overrides/dokku
|
mv debian/lintian-overrides /tmp/build/usr/share/lintian/overrides/dokku
|
||||||
|
ifdef DOKKU_GIT_REV
|
||||||
|
echo "$(DOKKU_GIT_REV)" > /tmp/build/var/lib/dokku/GIT_REV
|
||||||
|
else
|
||||||
git rev-parse HEAD > /tmp/build/var/lib/dokku/GIT_REV
|
git rev-parse HEAD > /tmp/build/var/lib/dokku/GIT_REV
|
||||||
|
endif
|
||||||
sed -i "s/^Version: .*/Version: `cat /tmp/build/var/lib/dokku/STABLE_VERSION`/g" /tmp/build/DEBIAN/control
|
sed -i "s/^Version: .*/Version: `cat /tmp/build/var/lib/dokku/STABLE_VERSION`/g" /tmp/build/DEBIAN/control
|
||||||
dpkg-deb --build /tmp/build "/tmp/dokku_`cat /tmp/build/var/lib/dokku/STABLE_VERSION`_$(DOKKU_ARCHITECTURE).deb"
|
dpkg-deb --build /tmp/build "/tmp/dokku_`cat /tmp/build/var/lib/dokku/STABLE_VERSION`_$(DOKKU_ARCHITECTURE).deb"
|
||||||
lintian "/tmp/dokku_`cat /tmp/build/var/lib/dokku/STABLE_VERSION`_$(DOKKU_ARCHITECTURE).deb"
|
lintian "/tmp/dokku_`cat /tmp/build/var/lib/dokku/STABLE_VERSION`_$(DOKKU_ARCHITECTURE).deb"
|
||||||
|
|||||||
10
rpm.mk
10
rpm.mk
@@ -65,12 +65,20 @@ rpm-dokku:
|
|||||||
cp /usr/local/share/man/man1/dokku.1 /tmp/build/usr/share/man/man1/dokku.1
|
cp /usr/local/share/man/man1/dokku.1 /tmp/build/usr/share/man/man1/dokku.1
|
||||||
gzip -9 /tmp/build/usr/share/man/man1/dokku.1
|
gzip -9 /tmp/build/usr/share/man/man1/dokku.1
|
||||||
cp contrib/dokku-installer.py /tmp/build/usr/share/dokku/contrib
|
cp contrib/dokku-installer.py /tmp/build/usr/share/dokku/contrib
|
||||||
|
ifeq ($(DOKKU_VERSION),master)
|
||||||
git describe --tags > /tmp/build/var/lib/dokku/VERSION
|
git describe --tags > /tmp/build/var/lib/dokku/VERSION
|
||||||
|
else
|
||||||
|
echo $(DOKKU_VERSION) > /tmp/build/var/lib/dokku/VERSION
|
||||||
|
endif
|
||||||
cat /tmp/build/var/lib/dokku/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/build/var/lib/dokku/STABLE_VERSION
|
cat /tmp/build/var/lib/dokku/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/build/var/lib/dokku/STABLE_VERSION
|
||||||
ifneq (,$(findstring false,$(IS_RELEASE)))
|
ifneq (,$(findstring false,$(IS_RELEASE)))
|
||||||
sed -i.bak -e "s/^/`date +%s`:/" /tmp/build/var/lib/dokku/STABLE_VERSION && rm /tmp/build/var/lib/dokku/STABLE_VERSION.bak
|
sed -i.bak -e "s/^/`date +%s`-/" /tmp/build/var/lib/dokku/STABLE_VERSION && rm /tmp/build/var/lib/dokku/STABLE_VERSION.bak
|
||||||
endif
|
endif
|
||||||
|
ifdef DOKKU_GIT_REV
|
||||||
|
echo "$(DOKKU_GIT_REV)" > /tmp/build/var/lib/dokku/GIT_REV
|
||||||
|
else
|
||||||
git rev-parse HEAD > /tmp/build/var/lib/dokku/GIT_REV
|
git rev-parse HEAD > /tmp/build/var/lib/dokku/GIT_REV
|
||||||
|
endif
|
||||||
|
|
||||||
@echo "-> Creating rpm package"
|
@echo "-> Creating rpm package"
|
||||||
VERSION=$$(cat /tmp/build/var/lib/dokku/STABLE_VERSION); \
|
VERSION=$$(cat /tmp/build/var/lib/dokku/STABLE_VERSION); \
|
||||||
|
|||||||
Reference in New Issue
Block a user