Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-16 12:07:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: add support for Ubuntu 22.04

Browse Source 
Closes #5123
This commit is contained in:
Jose Diaz-Gonzalez
2022-05-10 17:37:59 -04:00
parent c68ae008cc
commit dfa5b21d71
5 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap.sh
View File

@@ -195,7 +195,7 @@ install-dokku-from-deb-package() {
fi fi
if [[ "$DOKKU_DISTRO" == "ubuntu" ]]; then if [[ "$DOKKU_DISTRO" == "ubuntu" ]]; then
OS_IDS=("bionic" "focal") OS_IDS=("bionic" "focal" "jammy")
if ! in-array "$OS_ID" "${OS_IDS[@]}"; then if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
OS_ID="bionic" OS_ID="bionic"
fi fi

23
contrib/copy-packages
View File

@@ -5,19 +5,17 @@ import shutil
import subprocess import subprocess
from requests.auth import HTTPBasicAuth from requests.auth import HTTPBasicAuth
PACKAGECLOUD_TOKEN = os.getenv('DOKKU_PACKAGECLOUD_TOKEN') PACKAGECLOUD_TOKEN = os.getenv("DOKKU_PACKAGECLOUD_TOKEN")
def download_file(filename, url): def download_file(filename, url):
r = requests.get(url, stream=True) r = requests.get(url, stream=True)
with open(filename, 'wb') as f: with open(filename, "wb") as f:
shutil.copyfileobj(r.raw, f) shutil.copyfileobj(r.raw, f)
def upload_file(filename): def upload_file(filename):
versions = [ versions = ["jammy"]
"focal"
]
cmd_template = "package_cloud push dokku/dokku/ubuntu/{0} {1}" cmd_template = "package_cloud push dokku/dokku/ubuntu/{0} {1}"
for version in versions: for version in versions:
cmd = cmd_template.format(version, filename) cmd = cmd_template.format(version, filename)
@@ -25,21 +23,22 @@ def upload_file(filename):
def main(): def main():
auth = HTTPBasicAuth(PACKAGECLOUD_TOKEN, '') auth = HTTPBasicAuth(PACKAGECLOUD_TOKEN, "")
base = requests.get('https://packagecloud.io/api/v1/repos/dokku/dokku/packages/deb/ubuntu/bionic.json', base = requests.get(
auth=auth) "https://packagecloud.io/api/v1/repos/dokku/dokku/packages/deb/ubuntu/focal.json",
auth=auth,
)
data = base.json() data = base.json()
urls = [] urls = []
for package in data: for package in data:
urls.append(package['versions_url']) urls.append(package["versions_url"])
download_urls = {} download_urls = {}
for url in urls: for url in urls:
base = requests.get('https://packagecloud.io{0}'.format(url), base = requests.get("https://packagecloud.io{0}".format(url), auth=auth)
auth=auth)
data = base.json() data = base.json()
for version in data: for version in data:
download_urls['downloads/' + version['filename']] = version['download_url'] download_urls["downloads/" + version["filename"]] = version["download_url"]
for filename, download_url in download_urls.items(): for filename, download_url in download_urls.items():
print("downloading {0}".format(filename)) print("downloading {0}".format(filename))

2
contrib/release-dokku
View File

@@ -148,7 +148,7 @@ fn-publish-package() {
fi fi
done done
elif [[ "$DIST" == "ubuntu" ]]; then elif [[ "$DIST" == "ubuntu" ]]; then
OS_IDS=("bionic" "focal") OS_IDS=("bionic" "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"

2
docs/getting-started/install/debian.md
View File

@@ -13,7 +13,7 @@ wget -nv -O - https://get.docker.com/ | sh
# install dokku # install dokku
wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add - wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -
OS_ID="$(lsb_release -cs 2>/dev/null || echo "bionic")" OS_ID="$(lsb_release -cs 2>/dev/null || echo "bionic")"
echo "bionic focal" | grep -q "$OS_ID" || OS_ID="bionic" echo "bionic focal jammy" | grep -q "$OS_ID" || OS_ID="bionic"
echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ ${OS_ID} main" | sudo tee /etc/apt/sources.list.d/dokku.list 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 -qq -y install dokku sudo apt-get -qq -y install dokku

2
docs/home.html
View File

@@ -143,7 +143,7 @@
<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 "bionic focal" | grep -q "$OS_ID" || OS_ID="bionic"</span> <span class="command">echo "bionic focal jammy" | grep -q "$OS_ID" || OS_ID="bionic"</span>
</p> </p>
<p class="line"> <p class="line">
<span class="path"></span> <span class="path"></span>