fix: ensure releases take docker-based installation into account when updating version numbers

This commit is contained in:
Jose Diaz-Gonzalez committed 2019-07-18 00:24:24 -04:00
1 parent 98bf4b7b31
commit 6fe984fd3c
5 files changed
+24 -22

No files matched your search

+2
View File
@@ -215,6 +215,8 @@ fn-repo-update() {
fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/getting-started/installation.md fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/getting-started/installation.md
fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/template.html fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/template.html
fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" README.md fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" README.md
fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" Dockerfile
fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/getting-started/install/docker.md
if [[ "$RELEASE" == 'patch' ]]; then if [[ "$RELEASE" == 'patch' ]]; then
fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/assets/versions.json fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/assets/versions.json
@@ -31,6 +31,17 @@ main() {
find "$dir" -print0 | xargs -0 chown -h dokku:dokku find "$dir" -print0 | xargs -0 chown -h dokku:dokku
fi fi
done done
if [[ -f /mount/plugin-list ]]; then
while read line; do
dokku plugin:install "$(echo "$line" | awk '{print $2}')" "$(echo "$line" | cut -d':' -f1)"
done </mount/plugin-list
fi
if [[ -n "$DOKKU_HOSTNAME" ]]; then
echo "dokku dokku/vhost_enable boolean true" | debconf-set-selections
dokku --quiet domains:set-global "$DOKKU_HOSTNAME"
fi
} }
main "$@" main "$@"
@@ -1,20 +0,0 @@
#!/bin/bash
exec >> /var/log/services/dokku-init
exec 2>&1
echo "Running dokku-init"
cd /tmp || exit 1
if [[ -f /mount/plugin-list ]]; then
while read line; do
dokku plugin:install "$(echo "$line" | awk '{print $2}')" "$(echo "$line" | cut -d':' -f1)"
done </mount/plugin-list
fi
if [[ -n "$DOKKU_HOSTNAME" ]]; then
echo "dokku dokku/vhost_enable boolean true" | debconf-set-selections
dokku --quiet domains:set-global "$DOKKU_HOSTNAME"
fi
exec dokku ps:restore
@@ -4,12 +4,12 @@ exec >> /var/log/services/dokku-restore
exec 2>&1 exec 2>&1
if [[ "$1" -ne 0 ]]; then if [[ "$1" -ne 0 ]]; then
echo "Error initializing dokku! Retrying in 30 seconds..." echo "Error restoring dokku apps! Retrying in 30 seconds..."
exec sleep 30 exec sleep 30
exit 0 exit 0
fi fi
echo "Done initializing dokku." echo "Done restoring dokku apps."
exec sleep infinity exec sleep infinity
exit 0 exit 0
+9
View File
@@ -0,0 +1,9 @@
#!/bin/bash
exec >> /var/log/services/dokku-restore
exec 2>&1
echo "Running dokku-restore"
cd /tmp || exit 1
exec dokku ps:restore