Skip to content

Commit 7afadb7

Browse files
committed
update(build): dynamic sysdig download
sysdig-CLA-1.0-signed-off-by: Roberto Scolaro <[email protected]> Signed-off-by: Roberto Scolaro <[email protected]>
1 parent 1ae875f commit 7afadb7

File tree

2 files changed

+21
-13
lines changed

2 files changed

+21
-13
lines changed

VERSION

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/build.sh

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
SYSDIG_VERSION="0.27.1"
4-
SYSDIG_VERSION_MAC="0.27.0"
3+
SYSDIG_VERSION="0.32.1"
4+
SYSDIG_VERSION_MAC="0.32.1"
55

66
# Env parameters
77
# - CLEANUP (default: true)
@@ -61,22 +61,24 @@ setup_env() {
6161
fi
6262
if [ -z ${BUILD_NUMBER} ]
6363
then
64-
BUILD_NUMBER=42
64+
BUILD_NUMBER=''
65+
else
66+
BUILD_NUMBER=.${BUILD_NUMBER}
6567
fi
6668

6769
set -u
6870

6971
GIT_BRANCHNAME=$(echo ${GIT_BRANCH} | cut -d"/" -f2)
7072

71-
if [ "${GIT_BRANCHNAME}" = "master" ]; then
73+
if [ "${GIT_BRANCHNAME}" != "dev" ]; then
7274
ENVIRONMENT=production
7375
fi
7476

75-
INSPECT_USER_VERSION=`cat VERSION`
76-
if [ "${ENVIRONMENT}" = "production" ]; then
77-
INSPECT_VERSION=${INSPECT_USER_VERSION}
77+
INSPECT_USER_VERSION=$(grep '"version"' package.json | cut -d\" -f4)
78+
if [[ "${ENVIRONMENT}" = "production" ]]; then
79+
INSPECT_VERSION=${GIT_BRANCHNAME}
7880
else
79-
INSPECT_VERSION=${INSPECT_USER_VERSION}.${BUILD_NUMBER}
81+
INSPECT_VERSION=${INSPECT_USER_VERSION}${BUILD_NUMBER}
8082
fi
8183

8284
# Disabling interactive progress bar, and spinners gains 2x performances
@@ -118,8 +120,11 @@ install_dependencies() {
118120

119121
mkdir -p deps/sysdig-mac
120122

121-
curl https://download.sysdig.com/dependencies/sysdig-${SYSDIG_VERSION_MAC}-mac.zip -o sysdig.zip
122-
unzip -d deps/sysdig-mac sysdig.zip
123+
curl -L -o sysdig.dmg "https://github.com/draios/sysdig/releases/download/${SYSDIG_VERSION_MAC}/sysdig-${SYSDIG_VERSION_MAC}-x86_64.dmg"
124+
7z x sysdig.dmg || true
125+
cp -v sysdig-${SYSDIG_VERSION_MAC}-x86_64/bin/sysdig deps/sysdig-mac/
126+
cp -v sysdig-${SYSDIG_VERSION_MAC}-x86_64/bin/csysdig deps/sysdig-mac/
127+
cp -vr sysdig-${SYSDIG_VERSION_MAC}-x86_64/share/sysdig/chisels deps/sysdig-mac/
123128
fi
124129
fi
125130
}
@@ -147,6 +152,10 @@ build() {
147152
mkdir -p out/linux/installers
148153
cp -r electron-out/make/* out/linux/installers
149154
cp -r electron-out/Sysdig\ Inspect-linux-x64/* out/linux/binaries
155+
cd out/linux/installers
156+
mv *.rpm sysdig-inspect-linux-x86_64.rpm
157+
mv *.deb sysdig-inspect-linux-x86_64.deb
158+
cd -
150159
fi
151160

152161
if [ "${BUILD_CONTAINER}" = "true" ]; then
@@ -196,10 +205,10 @@ build() {
196205
zip -ry Sysdig\ Inspect-darwin-x64.zip Sysdig\ Inspect-darwin-x64
197206
cd ..
198207
mkdir -p out/mac/binaries
199-
cp electron-out/Sysdig\ Inspect-darwin-x64.zip out/mac/binaries/sysdig-inspect-${INSPECT_VERSION}-mac.zip
208+
cp electron-out/Sysdig\ Inspect-darwin-x64.zip out/mac/binaries/sysdig-inspect-mac-x86_64.zip
200209
if [ "${BUILD_MAC_INSTALLER}" = "true" ]; then
201210
mkdir -p out/mac/installers
202-
cp electron-out/make/Sysdig\ Inspect-${INSPECT_USER_VERSION}.dmg out/mac/installers/sysdig-inspect-${INSPECT_VERSION}-mac.dmg
211+
cp electron-out/make/Sysdig\ Inspect-${INSPECT_USER_VERSION}.dmg out/mac/installers/sysdig-inspect-mac-x86_64.dmg
203212
fi
204213
fi
205214
}

0 commit comments

Comments
 (0)