@@ -30,12 +30,12 @@ export DEBIAN_FRONTEND=noninteractive
3030
3131# Requirements file.
3232#
33- export REQUIREMENTS_LINK=" https://aka.ms/azdata"
33+ # export REQUIREMENTS_LINK="https://aka.ms/azdata"
3434
3535# Kube version.
3636#
37- KUBE_DPKG_VERSION=1.15.0 -00
38- KUBE_VERSION=1.15.0
37+ KUBE_DPKG_VERSION=1.16.3 -00
38+ KUBE_VERSION=1.16.3
3939
4040# Wait for 5 minutes for the cluster to be ready.
4141#
@@ -46,7 +46,7 @@ RETRY_INTERVAL=5
4646#
4747export DOCKER_REGISTRY=" mcr.microsoft.com"
4848export DOCKER_REPOSITORY=" mssql/bdc"
49- export DOCKER_TAG=" 2019-CU5 -ubuntu-16.04"
49+ export DOCKER_TAG=" 2019-CU8 -ubuntu-16.04"
5050
5151# Variables used for azdata cluster creation.
5252#
@@ -58,7 +58,7 @@ export STORAGE_CLASS=local-storage
5858export PV_COUNT=" 30"
5959
6060IMAGES=(
61- mssql-app-service-proxy
61+ mssql-app-service-proxy
6262 mssql-control-watchdog
6363 mssql-controller
6464 mssql-dns
@@ -78,7 +78,7 @@ IMAGES=(
7878 mssql-server-controller
7979 mssql-server-data
8080 mssql-ha-operator
81- mssql-ha-supervisor
81+ mssql-ha-supervisor
8282 mssql-service-proxy
8383 mssql-ssis-app-runtime
8484)
@@ -105,39 +105,51 @@ apt --yes install \
105105 software-properties-common \
106106 apt-transport-https \
107107 ca-certificates \
108+ lsb-release \
109+ gnupg \
110+ wget \
108111 curl
109112
113+
110114curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
111115
112116add-apt-repository \
113117 " deb [arch=amd64] https://download.docker.com/linux/ubuntu $( lsb_release -cs) stable"
114118
115119apt update -q
116- apt-get install -q --yes docker-ce=18.06.2~ce~3-0~ubuntu --allow-downgrades
117- apt-mark hold docker-ce
120+ apt-cache policy docker-ce
121+ apt --yes install docker-ce
118122
119123usermod --append --groups docker $USER
120124
121125# Install python3, python3-pip, requests.
122126#
123- apt-get install -q -y python3
124- apt-get install -q -y python3-pip
125- apt-get install -y libkrb5-dev
126- apt-get install -y libsqlite3-dev
127- apt-get install -y unixodbc-dev
128-
129- pip3 install requests --upgrade
127+ apt install -y libodbc1 odbcinst odbcinst1debian2 unixodbc apt-transport-https libkrb5-dev
130128
131- # Install and create virtualenv.
129+ # Download and install azdata package
132130#
133- pip3 install --upgrade virtualenv
134- virtualenv -p python3 $VIRTUALENV_NAME
135- source $VIRTUALENV_NAME /bin/activate
131+ echo " "
136132
137- # Install azdata cli.
138- #
139- pip3 install -r $REQUIREMENTS_LINK
140- echo " Packages installed."
133+ curl -sL https://packages.microsoft.com/keys/microsoft.asc |
134+ gpg --dearmor |
135+ tee /etc/apt/trusted.gpg.d/microsoft.asc.gpg > /dev/null
136+
137+ code=$( lsb_release -cs)
138+ if [ $code == " focal" ]; then
139+ add-apt-repository " $( wget -qO- https://packages.microsoft.com/config/ubuntu/20.04/prod.list) "
140+ elif [ $code == " bionic" ]; then
141+ add-apt-repository " $( wget -qO- https://packages.microsoft.com/config/ubuntu/18.04/prod.list) "
142+ elif [ $code == " xenial" ]; then
143+ add-apt-repository " $( wget -qO- https://packages.microsoft.com/config/ubuntu/16.04/prod.list) "
144+ fi
145+
146+ apt-get update
147+ apt-get install -y azdata-cli
148+
149+ cd -
150+
151+ azdata --version
152+ echo " Azdata has been successfully installed."
141153
142154# Load all pre-requisites for Kubernetes.
143155#
@@ -331,10 +343,3 @@ kubectl config set-context --current --namespace $CLUSTER_NAME
331343#
332344azdata login -n $CLUSTER_NAME
333345azdata bdc endpoint list --output table
334-
335- if [ -d " $HOME /.azdata/" ]; then
336- sudo chown -R $( id -u $SUDO_USER ) :$( id -g $SUDO_USER ) $HOME /.azdata/
337- fi
338-
339- echo " alias azdata='$BDCDEPLOY_DIR /$VIRTUALENV_NAME /bin/azdata'" >> $HOME /.bashrc
340- }| tee $LOG_FILE
0 commit comments