Merge pull request #6280 from dokku/remove-more-bionic

Remove more references to ubuntu bionic
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2023-10-15 20:23:05 -04:00
commit c41cf0c4a3
3 files changed
+6 -6

No files matched your search

+4 -4
View File
@@ -185,16 +185,16 @@ install-dokku-from-deb-package() {
wget -nv -O - https://get.docker.com/ | sh wget -nv -O - https://get.docker.com/ | sh
fi fi
OS_ID="$(lsb_release -cs 2>/dev/null || echo "bionic")" OS_ID="$(lsb_release -cs 2>/dev/null || echo "jammy")"
if ! in-array "$DOKKU_DISTRO" "debian" "ubuntu" "raspbian"; then if ! in-array "$DOKKU_DISTRO" "debian" "ubuntu" "raspbian"; then
DOKKU_DISTRO="ubuntu" DOKKU_DISTRO="ubuntu"
OS_ID="bionic" OS_ID="jammy"
fi fi
if [[ "$DOKKU_DISTRO" == "ubuntu" ]]; then if [[ "$DOKKU_DISTRO" == "ubuntu" ]]; then
OS_IDS=("bionic" "focal" "jammy") OS_IDS=("focal" "jammy")
if ! in-array "$OS_ID" "${OS_IDS[@]}"; then if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
OS_ID="bionic" OS_ID="jammy"
fi fi
elif [[ "$DOKKU_DISTRO" == "debian" ]]; then elif [[ "$DOKKU_DISTRO" == "debian" ]]; then
OS_IDS=("stretch" "buster" "bullseye" "bookworm") OS_IDS=("stretch" "buster" "bullseye" "bookworm")
@@ -50,7 +50,7 @@ echo '--> Setting up dokku apt repository'
curl -fsSL https://packagecloud.io/dokku/dokku/gpgkey -o /etc/apt/keyrings/dokku.asc curl -fsSL https://packagecloud.io/dokku/dokku/gpgkey -o /etc/apt/keyrings/dokku.asc
cat >/etc/apt/sources.list.d/dokku.list <<EOM cat >/etc/apt/sources.list.d/dokku.list <<EOM
deb [arch=amd64 signed-by=/etc/apt/keyrings/dokku.asc] https://packagecloud.io/dokku/dokku/ubuntu/ bionic main deb [arch=amd64 signed-by=/etc/apt/keyrings/dokku.asc] https://packagecloud.io/dokku/dokku/ubuntu/ jammy main
EOM EOM
echo '--> Install dependencies for dokku from new repository' echo '--> Install dependencies for dokku from new repository'
+1 -1
View File
@@ -144,7 +144,7 @@ fn-publish-package() {
fi fi
done done
elif [[ "$DIST" == "ubuntu" ]]; then elif [[ "$DIST" == "ubuntu" ]]; then
OS_IDS=("bionic" "focal" "jammy") OS_IDS=("focal" "jammy")
for OS_ID in "${OS_IDS[@]}"; do for OS_ID in "${OS_IDS[@]}"; do
log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}" log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME" package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"