Merge pull request #3032 from dokku/2263-1604-support

Add support for arbitrary ubuntu versions
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2018-02-24 18:03:39 -05:00
commit 86a0ae1dde
5 files changed
+41 -10

No files matched your search

+13 -3
View File
@@ -46,13 +46,20 @@ install-dokku() {
minor=$(echo "$DOKKU_SEMVER" | awk '{split($0,a,"."); print a[2]}') minor=$(echo "$DOKKU_SEMVER" | awk '{split($0,a,"."); print a[2]}')
patch=$(echo "$DOKKU_SEMVER" | awk '{split($0,a,"."); print a[3]}') patch=$(echo "$DOKKU_SEMVER" | awk '{split($0,a,"."); print a[3]}')
use_plugin=false
# 0.4.0 implemented a `plugin` plugin
if [[ "$major" -eq "0" ]] && [[ "$minor" -ge "4" ]] && [[ "$patch" -ge "0" ]]; then
use_plugin=true
elif [[ "$major" -ge "1" ]]; then
use_plugin=true
fi
# 0.3.13 was the first version with a debian package # 0.3.13 was the first version with a debian package
if [[ "$major" -eq "0" ]] && [[ "$minor" -eq "3" ]] && [[ "$patch" -ge "13" ]]; then if [[ "$major" -eq "0" ]] && [[ "$minor" -eq "3" ]] && [[ "$patch" -ge "13" ]]; then
install-dokku-from-package "$DOKKU_SEMVER" install-dokku-from-package "$DOKKU_SEMVER"
echo "--> Running post-install dependency installation" echo "--> Running post-install dependency installation"
dokku plugins-install-dependencies dokku plugins-install-dependencies
# 0.4.0 implemented a `plugin` plugin elif [[ "$use_plugin" == "true" ]]; then
elif [[ "$major" -eq "0" ]] && [[ "$minor" -ge "4" ]] && [[ "$patch" -ge "0" ]]; then
install-dokku-from-package "$DOKKU_SEMVER" install-dokku-from-package "$DOKKU_SEMVER"
echo "--> Running post-install dependency installation" echo "--> Running post-install dependency installation"
sudo -E dokku plugin:install-dependencies --core sudo -E dokku plugin:install-dependencies --core
@@ -104,6 +111,7 @@ install-dokku-from-package() {
install-dokku-from-deb-package() { install-dokku-from-deb-package() {
local DOKKU_CHECKOUT="$1" local DOKKU_CHECKOUT="$1"
local NO_INSTALL_RECOMMENDS=${DOKKU_NO_INSTALL_RECOMMENDS:=""} local NO_INSTALL_RECOMMENDS=${DOKKU_NO_INSTALL_RECOMMENDS:=""}
local OS_ID
if [[ -n $DOKKU_DOCKERFILE ]]; then if [[ -n $DOKKU_DOCKERFILE ]]; then
NO_INSTALL_RECOMMENDS=" --no-install-recommends " NO_INSTALL_RECOMMENDS=" --no-install-recommends "
@@ -127,9 +135,11 @@ install-dokku-from-deb-package() {
add-apt-repository -y ppa:nginx/stable add-apt-repository -y ppa:nginx/stable
fi fi
OS_ID="$(lsb_release -cs 2> /dev/null || echo "trusty")"
echo "--> Installing dokku" echo "--> Installing dokku"
wget -nv -O - https://packagecloud.io/gpg.key | apt-key add - wget -nv -O - https://packagecloud.io/gpg.key | apt-key add -
echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | tee /etc/apt/sources.list.d/dokku.list echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ $OS_ID main" | tee /etc/apt/sources.list.d/dokku.list
apt-get update -qq > /dev/null apt-get update -qq > /dev/null
[[ -n $DOKKU_VHOST_ENABLE ]] && echo "dokku dokku/vhost_enable boolean $DOKKU_VHOST_ENABLE" | sudo debconf-set-selections [[ -n $DOKKU_VHOST_ENABLE ]] && echo "dokku dokku/vhost_enable boolean $DOKKU_VHOST_ENABLE" | sudo debconf-set-selections
+19 -4
View File
@@ -129,13 +129,28 @@ fn-version-next() {
fn-publish-package() { fn-publish-package() {
declare desc="Publishes a package to packagecloud" declare desc="Publishes a package to packagecloud"
declare IS_RELEASE="$1" RELEASE_TYPE="$2" PACKAGE_NAME="$3" declare IS_RELEASE="$1" RELEASE_TYPE="$2" PACKAGE_NAME="$3"
local REPOSITORY=dokku/dokku-betafish DIST=ubuntu/trusty local REPOSITORY=dokku/dokku-betafish DIST=ubuntu EXIT_CODE=0
local OS_ID ex
[[ "$IS_RELEASE" == "true" ]] && REPOSITORY=dokku/dokku [[ "$IS_RELEASE" == "true" ]] && REPOSITORY=dokku/dokku
[[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7 [[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
package_cloud push "${REPOSITORY}/${DIST}" "$PACKAGE_NAME" if [[ "$DIST" == "ubuntu" ]]; then
return "$?" OS_IDS=("trusty" "utopic" "vivid" "wily" "xenial" "yakkety" "zesty" "artful")
for OS_ID in "${OS_IDS[@]}"; do
log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
ex="$?"
if [[ "$ex" -ne "0" ]]; then
EXIT_CODE="$ex"
fi
done
else
log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
package_cloud push "${REPOSITORY}/${DIST}" "$PACKAGE_NAME"
EXIT_CODE="$?"
fi
return "$EXIT_CODE"
} }
fn-replace-version() { fn-replace-version() {
+1 -1
View File
@@ -70,7 +70,7 @@ install-from-deb:
@echo "--> Installing dokku" @echo "--> Installing dokku"
wget -nv -O - https://packagecloud.io/gpg.key | apt-key add - wget -nv -O - https://packagecloud.io/gpg.key | apt-key add -
@echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/dokku.list @echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ $(shell lsb_release -cs 2> /dev/null || echo "trusty") main" | sudo tee /etc/apt/sources.list.d/dokku.list
sudo apt-get update -qq > /dev/null sudo apt-get update -qq > /dev/null
sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -yy dokku sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -yy dokku
+2 -1
View File
@@ -12,7 +12,8 @@ wget -nv -O - https://get.docker.com/ | sh
# install dokku # install dokku
wget -nv -O - https://packagecloud.io/gpg.key | apt-key add - wget -nv -O - https://packagecloud.io/gpg.key | apt-key add -
echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/dokku.list OS_ID="$(lsb_release -cs 2> /dev/null || echo "trusty")"
echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ ${OS_ID} main" | sudo tee /etc/apt/sources.list.d/dokku.list
sudo apt-get update -qq > /dev/null sudo apt-get update -qq > /dev/null
sudo apt-get install -qq -y dokku sudo apt-get install -qq -y dokku
sudo dokku plugin:install-dependencies --core sudo dokku plugin:install-dependencies --core
+6 -1
View File
@@ -135,7 +135,12 @@
<p class="line"> <p class="line">
<span class="path"></span> <span class="path"></span>
<span class="prompt">$</span> <span class="prompt">$</span>
<span class="command">echo "deb $SOURCE trusty main" | tee /etc/apt/sources.list.d/dokku.list</span> <span class="command">export OS_ID="$(lsb_release -cs 2> /dev/null || echo "trusty")"</span>
</p>
<p class="line">
<span class="path"></span>
<span class="prompt">$</span>
<span class="command">echo "deb $SOURCE $OS_ID main" | tee /etc/apt/sources.list.d/dokku.list</span>
</p> </p>
<p class="line"> <p class="line">
<span class="path"></span> <span class="path"></span>