Skip to content
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

updates for release 10.0.0-1 & ciprod05262020 #406

Merged
merged 3 commits into from
May 27, 2020
Merged

updates for release 10.0.0-1 & ciprod05262020 #406

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8ce6b5
updates for release 10.0.0-1
ganga1980 May 27, 2020
10e81cb
Update setup.sh
ganga1980 May 27, 2020
9d95895
Update setup.sh
ganga1980 May 27, 2020
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
6 changes: 3 additions & 3 deletions ci_feature/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ FROM ubuntu:18.04
MAINTAINER [email protected]
LABEL vendor=Microsoft\ Corp \
com.microsoft.product="OMS Container Docker Provider" \
com.microsoft.version="10.0.0-0"
com.microsoft.version="10.0.0-1"
ENV tmpdir /opt
ENV APPLICATIONINSIGHTS_AUTH OTQzNWI0M2YtOTdkNS00ZGVkLThkOTAtYjA0Nzk1OGU2ZTg3
ENV AGENT_VERSION ciprod05222020
ENV AGENT_VERSION ciprod05262020
ENV MALLOC_ARENA_MAX 2
ENV HOST_MOUNT_PREFIX /hostfs
ENV HOST_PROC /hostfs/proc
ENV HOST_SYS /hostfs/sys
ENV HOST_ETC /hostfs/etc
ENV HOST_VAR /hostfs/var
ENV AZMON_COLLECT_ENV False
ENV KUBE_CLIENT_BACKOFF_BASE 1
ENV KUBE_CLIENT_BACKOFF_BASE 1
ENV KUBE_CLIENT_BACKOFF_DURATION 0
RUN /usr/bin/apt-get update && /usr/bin/apt-get install -y libc-bin wget openssl curl sudo python-ctypes init-system-helpers net-tools rsyslog cron vim dmidecode apt-transport-https gnupg && rm -rf /var/lib/apt/lists/*
COPY setup.sh main.sh defaultpromenvvariables defaultpromenvvariables-rs $tmpdir/
Expand Down
4 changes: 2 additions & 2 deletions ci_feature/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ wget https://github.com/Microsoft/OMS-Agent-for-Linux/releases/download/OMSAgent
#create file to disable omi service startup script
touch /etc/.omi_disable_service_control

wget https://github.com/microsoft/Docker-Provider/releases/download/10.0.0.0/docker-cimprov-10.0.0-0.universal.x86_64.sh
https://github.com/microsoft/Docker-Provider/releases/download/10.0.0-1/docker-cimprov-10.0.0-1.universal.x86_64.sh

chmod 775 $TMPDIR/*.sh

Expand Down Expand Up @@ -43,7 +43,7 @@ sudo apt-get install inotify-tools -y
#used to parse response of kubelet apis
sudo apt-get install jq -y

#used to setcaps for ruby process to read /proc/env
#used to setcaps for ruby process to read /proc/env
echo "installing libcap2-bin"
sudo apt-get install libcap2-bin -y

Expand Down
6 changes: 3 additions & 3 deletions ci_feature_prod/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ FROM ubuntu:18.04
MAINTAINER [email protected]
LABEL vendor=Microsoft\ Corp \
com.microsoft.product="OMS Container Docker Provider" \
com.microsoft.version="10.0.0-0"
com.microsoft.version="10.0.0-1"
ENV tmpdir /opt
ENV APPLICATIONINSIGHTS_AUTH NzAwZGM5OGYtYTdhZC00NThkLWI5NWMtMjA3ZjM3NmM3YmRi
ENV AGENT_VERSION ciprod05222020
ENV AGENT_VERSION ciprod05262020
ENV MALLOC_ARENA_MAX 2
ENV HOST_MOUNT_PREFIX /hostfs
ENV HOST_PROC /hostfs/proc
ENV HOST_SYS /hostfs/sys
ENV HOST_ETC /hostfs/etc
ENV HOST_VAR /hostfs/var
ENV AZMON_COLLECT_ENV False
ENV KUBE_CLIENT_BACKOFF_BASE 1
ENV KUBE_CLIENT_BACKOFF_BASE 1
ENV KUBE_CLIENT_BACKOFF_DURATION 0
RUN /usr/bin/apt-get update && /usr/bin/apt-get install -y libc-bin wget openssl curl sudo python-ctypes init-system-helpers net-tools rsyslog cron vim dmidecode apt-transport-https gnupg && rm -rf /var/lib/apt/lists/*
COPY setup.sh main.sh defaultpromenvvariables defaultpromenvvariables-rs $tmpdir/
Expand Down
6 changes: 3 additions & 3 deletions ci_feature_prod/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ wget https://github.com/Microsoft/OMS-Agent-for-Linux/releases/download/OMSAgent
#create file to disable omi service startup script
touch /etc/.omi_disable_service_control

wget https://github.com/microsoft/Docker-Provider/releases/download/10.0.0.0/docker-cimprov-10.0.0-0.universal.x86_64.sh
https://github.com/microsoft/Docker-Provider/releases/download/10.0.0-1/docker-cimprov-10.0.0-1.universal.x86_64.sh

chmod 775 $TMPDIR/*.sh

Expand Down Expand Up @@ -43,7 +43,7 @@ sudo apt-get install inotify-tools -y
#used to parse response of kubelet apis
sudo apt-get install jq -y

#used to setcaps for ruby process to read /proc/env
#used to setcaps for ruby process to read /proc/env
echo "installing libcap2-bin"
sudo apt-get install libcap2-bin -y
#/$TMPDIR/omsbundle/oss-kits/docker-cimprov-1.0.0-*.x86_64.sh --install
Expand All @@ -63,7 +63,7 @@ chmod 777 /opt/telegraf

#download and install fluent-bit(td-agent-bit)
wget -qO - https://packages.fluentbit.io/fluentbit.key | sudo apt-key add -
sudo echo "deb https://packages.fluentbit.io/ubuntu/xenial xenial main" >> /etc/apt/sources.list
sudo echo "deb https://packages.fluentbit.io/ubuntu/xenial xenial main" >> /etc/apt/sources.list
sudo apt-get update
sudo apt-get install td-agent-bit=1.4.2 -y

Expand Down