Skip to content

Add Debian Codename resolving #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
iamjla wants to merge 1 commit into from
Closed

Add Debian Codename resolving #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 2 additions & 27 deletions dist/19.03.15.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,21 +113,7 @@ check_forked() {
if [ -r /etc/debian_version ] && [ "$lsb_dist" != "ubuntu" ] && [ "$lsb_dist" != "raspbian" ]; then
# We're Debian and don't even know it!
lsb_dist=debian
dist_version="$(cat /etc/debian_version | sed 's/\/.*//' | sed 's/\..*//')"
case "$dist_version" in
10)
dist_version="buster"
;;
9)
dist_version="stretch"
;;
8|'Kali Linux 2')
dist_version="jessie"
;;
7)
dist_version="wheezy"
;;
esac
dist_version="$(cat /etc/os-release | sed -n 's/^VERSION_CODENAME=//p')"
fi
fi
fi
Expand Down Expand Up @@ -334,18 +320,7 @@ do_install() {
;;

debian|raspbian)
dist_version="$(cat /etc/debian_version | sed 's/\/.*//' | sed 's/\..*//')"
case "$dist_version" in
9)
dist_version="stretch"
;;
8)
dist_version="jessie"
;;
7)
dist_version="wheezy"
;;
esac
dist_version="$(cat /etc/os-release | sed -n 's/^VERSION_CODENAME=//p')"
;;

oracleserver)
Expand Down
32 changes: 2 additions & 30 deletions dist/20.10.12.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,21 +260,7 @@ check_forked() {
# We're Debian and don't even know it!
lsb_dist=debian
fi
dist_version="$(sed 's/\/.*//' /etc/debian_version | sed 's/\..*//')"
case "$dist_version" in
11)
dist_version="bullseye"
;;
10)
dist_version="buster"
;;
9)
dist_version="stretch"
;;
8)
dist_version="jessie"
;;
esac
dist_version="$(cat /etc/os-release | sed -n 's/^VERSION_CODENAME=//p')"
fi
fi
fi
Expand Down Expand Up @@ -348,21 +334,7 @@ do_install() {
;;

debian|raspbian)
dist_version="$(sed 's/\/.*//' /etc/debian_version | sed 's/\..*//')"
case "$dist_version" in
11)
dist_version="bullseye"
;;
10)
dist_version="buster"
;;
9)
dist_version="stretch"
;;
8)
dist_version="jessie"
;;
esac
dist_version="$(cat /etc/os-release | sed -n 's/^VERSION_CODENAME=//p')"
;;

centos|rhel|sles|rocky)
Expand Down
5 changes: 4 additions & 1 deletion scripts/test-docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ done
test_docker_versions["ubuntu:16.04"]="^18.06|^18.09|^19.03|^20.10.[2-7]"
test_docker_versions["ubuntu:18.04"]="^18.06|^18.09|^19.03|^20.10"
test_docker_versions["ubuntu:20.04"]="^19.03.9$|^19.03.1[0-9]|^20.10"
test_docker_versions["debian:10"]="^19.03.15$|^20.10"
test_docker_versions["debian:11"]="^20.10.1[0-9]"
test_docker_versions["centos:centos7"]="^18.06|^18.09|^19.03|^20.10"
test_docker_versions["centos:centos8"]="^20.10.[7-9]|^20.10.1[0-9]"
test_docker_versions["oraclelinux:7"]="^19.03|^20.10"
Expand All @@ -32,13 +34,14 @@ for DOCKER_VERSION_SCRIPT in $(find ../dist/ -mindepth 1 -type f -exec basename
source $DOCKER_VERSION/config.sh
fi
if [ -z "${TEST_OS_IMAGE_NAME}" ]; then
TEST_OS_IMAGE_NAME=(oraclelinux centos ubuntu rockylinux)
TEST_OS_IMAGE_NAME=(oraclelinux centos ubuntu rockylinux debian)
fi
if [ -z "${TEST_OS_IMAGE_TAG}" ]; then
TEST_OS_IMAGE_TAG[0]="7 8"
TEST_OS_IMAGE_TAG[1]="centos7 centos8"
TEST_OS_IMAGE_TAG[2]="16.04 18.04 20.04"
TEST_OS_IMAGE_TAG[3]="8"
TEST_OS_IMAGE_TAG[4]="10 11"

fi
for (( index=0; index<${#TEST_OS_IMAGE_NAME[@]}; index++ )); do
Expand Down