diff options
Diffstat (limited to 'deployments')
| -rw-r--r-- | deployments/Dockerfile | 12 | ||||
| -rwxr-xr-x | deployments/start.sh | 20 |
2 files changed, 16 insertions, 16 deletions
diff --git a/deployments/Dockerfile b/deployments/Dockerfile index 7dc76f45..b3e2f061 100644 --- a/deployments/Dockerfile +++ b/deployments/Dockerfile @@ -16,12 +16,6 @@ ENV http_proxy $HTTP_PROXY ENV https_proxy $HTTPS_PROXY ENV no_proxy $NO_PROXY -ENV CSAR_DIR "/opt/csar" -ENV KUBE_CONFIG_DIR "/opt/kubeconfig" -ENV DATABASE_TYPE "consul" -ENV DATABASE_IP "127.0.0.1" -ENV OVN_CENTRAL_ADDRESS "127.0.0.1:6641" - EXPOSE 8081 RUN groupadd -r onap && useradd -r -g onap onap @@ -30,11 +24,11 @@ RUN apt-get update && apt-get install -y -qq apt-transport-https curl \ && curl https://packages.wand.net.nz/keyring.gpg -o /etc/apt/trusted.gpg.d/wand.gpg \ && apt-get update && apt install -y -qq ovn-common -WORKDIR /opt/multicloud/k8s -RUN chown onap:onap /opt/multicloud/k8s -R +WORKDIR /opt/multicloud/k8splugin +RUN chown onap:onap /opt/multicloud/k8splugin -R ADD --chown=onap ./k8plugin ./ -ADD --chown=onap ./*.so ./ +ADD --chown=onap ./*.so ./plugins/ USER onap diff --git a/deployments/start.sh b/deployments/start.sh index 233e0282..f8dc8e7f 100755 --- a/deployments/start.sh +++ b/deployments/start.sh @@ -15,19 +15,25 @@ source /etc/environment k8s_path="$(git rev-parse --show-toplevel)" export GOPATH=$k8s_path - -export DATABASE_TYPE=mongo -export PLUGINS_DIR=$k8s_path/src/k8splugin/plugins +export GO111MODULE=on echo "Starting mongo services" docker-compose kill docker-compose up -d mongo export DATABASE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(docker ps -aqf "name=mongo")) -export no_proxy=$no_proxy,$DATABASE_IP -export NO_PROXY=$NO_PROXY,$DATABASE_IP +export no_proxy=${no_proxy:-},$DATABASE_IP +export NO_PROXY=${NO_PROXY:-},$DATABASE_IP echo "Compiling source code" pushd $k8s_path/src/k8splugin/ -make plugins -env GO111MODULE=on go run cmd/main.go +cat << EOF > k8sconfig.json +{ + "database-address": "$DATABASE_IP", + "database-type": "mongo", + "plugin-dir": "$(pwd)/plugins", + "kube-config-dir": "$(pwd)/kubeconfigs" +} +EOF +make all +./k8plugin popd |