Skip to content

Fixed Non docker image repository problem #277

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed Non docker image repository problem #277

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
4 changes: 2 additions & 2 deletions utils/build-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ build_apisix_base_deb() {
DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends wget gnupg ca-certificates
wget -O - https://openresty.org/package/pubkey.gpg | apt-key add -

if [[ $IMAGE_BASE == "ubuntu" ]]; then
if [[ "${IMAGE_BASE/*\/}" == "ubuntu" ]]; then
echo "deb http://openresty.org/package/${arch_path}ubuntu $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/openresty.list
fi

if [[ $IMAGE_BASE == "debian" ]]; then
if [[ "${IMAGE_BASE/*\/}" == "debian" ]]; then
echo "deb http://openresty.org/package/${arch_path}debian $(lsb_release -sc) openresty" | tee /etc/apt/sources.list.d/openresty.list
fi

Expand Down
6 changes: 3 additions & 3 deletions utils/determine-dist.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ set -euo pipefail
set -x

dist="el7"
if [ "${IMAGE_BASE}" == "centos" ]
if [ "${IMAGE_BASE/*\/}" == "centos" ]
then
dist="el${IMAGE_TAG}"
elif [ "${IMAGE_BASE}" == "ubuntu" ]
elif [ "${IMAGE_BASE/*\/}" == "ubuntu" ]
then
dist="${IMAGE_BASE}${IMAGE_TAG}"
elif [ "${IMAGE_BASE}" == "debian" ]
elif [ "${IMAGE_BASE/*\/}" == "debian" ]
then
dist="${IMAGE_BASE}${IMAGE_TAG}"
fi
Expand Down
4 changes: 2 additions & 2 deletions utils/install-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ install_openresty_deb() {
DEBIAN_FRONTEND=noninteractive apt-get install -y libreadline-dev lsb-release libpcre3 libpcre3-dev libldap2-dev libssl-dev perl build-essential
DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends wget gnupg ca-certificates
wget -O - https://openresty.org/package/pubkey.gpg | apt-key add -
if [[ $IMAGE_BASE == "ubuntu" ]]; then
if [[ "${IMAGE_BASE/*\/}" == "ubuntu" ]]; then
echo "deb http://openresty.org/package/${arch_path}ubuntu $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/openresty.list
fi

if [[ $IMAGE_BASE == "debian" ]]; then
if [[ "${IMAGE_BASE/*\/}" == "debian" ]]; then
echo "deb http://openresty.org/package/${arch_path}debian $(lsb_release -sc) openresty" | tee /etc/apt/sources.list.d/openresty.list
fi
DEBIAN_FRONTEND=noninteractive apt-get update
Expand Down