Skip to content

Commit

Permalink
Update for Ubuntu 24 Docker
Browse files Browse the repository at this point in the history
- Update for Ubuntu 24 Docker
  • Loading branch information
tmiland committed Oct 4, 2024
1 parent 57ba4c1 commit cd49c3a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ If you're looking for a quick way to install, check out [Invidious-Installer](ht

| Debian | Ubuntu |
| ------ | ------ |
| [<img src="https://raw.githubusercontent.com/tmiland/Invidious-Updater/master/img/Debian_12.png" height="140" width="280">](https://raw.githubusercontent.com/tmiland/Invidious-Updater/master/img/Debian_12.png) | [<img src="https://raw.githubusercontent.com/tmiland/Invidious-Updater/master/img/Ubuntu.png" height="140" width="280">](https://raw.githubusercontent.com/tmiland/Invidious-Updater/master/img/Ubuntu.png)
| [<img src="https://raw.githubusercontent.com/tmiland/Invidious-Updater/master/img/Debian_12.png" height="140" width="280">](https://raw.githubusercontent.com/tmiland/Invidious-Updater/master/img/Debian_12.png) | [<img src="https://raw.githubusercontent.com/tmiland/Invidious-Updater/master/img/Ubuntu_24.png" height="140" width="280">](https://raw.githubusercontent.com/tmiland/Invidious-Updater/master/img/Ubuntu_24.png)

| CentOS | Fedora |
| ------ | ------ |
Expand Down Expand Up @@ -61,10 +61,8 @@ Tested and working on:

- [X] Tested extensively on Debian 9/10/11/12
- [X] Docker option tested and working
- [X] Tested on Ubuntu 16.04
- [X] Tested on Ubuntu 16.04/18.10/24
- [X] Docker option tested, not working
- [X] Tested on Ubuntu 18.10
- [X] Docker option tested and working
- [X] Tested on CentOS 8
- [ ] Docker option tested and working
- [X] Tested on Fedora 40
Expand Down
19 changes: 11 additions & 8 deletions invidious_update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,9 @@ install_docker() {
if [[ $(lsb_release -si) == "Debian" ||
$(lsb_release -si) == "Ubuntu" ||
$(lsb_release -si) == "PureOS" ]]; then
CODENAME=$(lsb_release -cs)
DISTRO=$(lsb_release -si)
DISTRO_TO_LOWER="${DISTRO,}"
#Install packages to allow apt to use a repository over HTTPS:
${SUDO} ${INSTALL} \
apt-transport-https \
Expand All @@ -992,7 +995,7 @@ install_docker() {
# Add Docker’s official GPG key:
curl -fsSLk https://download.docker.com/linux/debian/gpg |
${SUDO} gpg --dearmor -o /usr/share/keyrings/docker.gpg >/dev/null
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" |
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/$DISTRO_TO_LOWER $CODENAME stable" |
${SUDO} tee /etc/apt/sources.list.d/docker.list > /dev/null
# Update the apt package index:
${SUDO} ${UPDATE}
Expand All @@ -1002,19 +1005,19 @@ install_docker() {
${SUDO} docker run hello-world
shopt -s nocasematch
elif [[ $(lsb_release -si) == "LinuxMint" ]]; then
OS_CODENAME=$(lsb_release -cs)
case $OS_CODENAME in
CODENAME=$(lsb_release -cs)
case $CODENAME in
wilma )
OS_CODENAME=noble
CODENAME=noble
;;
virginia|victoria|vera|Vanessa )
OS_CODENAME=jammy
CODENAME=jammy
;;
uma|ulyssa|ulyana )
OS_CODENAME=focal
CODENAME=focal
;;
faye )
OS_CODENAME=bookworm
CODENAME=bookworm
;;
esac
#Install packages to allow apt to use a repository over HTTPS:
Expand All @@ -1027,7 +1030,7 @@ install_docker() {
# Add Docker’s official GPG key:
curl -fsSLk https://download.docker.com/linux/ubuntu/gpg |
${SUDO} gpg --dearmor -o /usr/share/keyrings/docker.gpg >/dev/null
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $OS_CODENAME stable" |
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $CODENAME stable" |
${SUDO} tee /etc/apt/sources.list.d/docker.list > /dev/null
# Update the apt package index:
${SUDO} ${UPDATE}
Expand Down

0 comments on commit cd49c3a

Please sign in to comment.