@cryptotaxi247 / netdata-1 / commits / 59916b01b

packaging/docker/{build,publish}.sh: Remove DEVEL support (#8702)

Konstantinos Natsakis committed Apr 14, 2020 at 19:00 UTC 59916b01b83026d6e6caf59f4efb67b7d428b70d

3 files changed +2 -13

.travis.yml

+2 -1

@@ -103,7 +103,8 @@ jobs:

103

104 - name: Docker container build process (alpine installation)

105 script: packaging/docker/build.sh

106 - env: DEVEL="true"

106 + env:

107 + - ARCH=amd64

108 after_failure: post_message "TRAVIS_MESSAGE" "Docker build process failed"

109

110 - name: Build/Install for ubuntu 18.04 (not containerized)

packaging/docker/build.sh

-6

@@ -16,7 +16,6 @@ fi

16 VERSION="$1"

17 declare -A ARCH_MAP

18 ARCH_MAP=(["i386"]="386" ["amd64"]="amd64" ["armhf"]="arm" ["aarch64"]="arm64")

19 -DEVEL_ARCHS=(amd64)

19 [ "${ARCHS}" ] || ARCHS="${!ARCH_MAP[@]}" # Use default ARCHS unless ARCHS are externally provided

21 if [ "${RELEASE_CHANNEL}" != "nightly" ] && [ "${RELEASE_CHANNEL}" != "stable" ]; then

@@ -34,11 +33,6 @@ if [ -z ${REPOSITORY} ]; then

33 fi

34 fi

37 -# When development mode is set, build on DEVEL_ARCHS

38 -if [ ! -z ${DEVEL+x} ]; then

39 - declare -a ARCHS=(${DEVEL_ARCHS[@]})

40 -fi

41 -

36 # Ensure there is a version, the most appropriate one

37 if [ "${VERSION}" == "" ]; then

38 VERSION=$(git tag --points-at)

packaging/docker/publish.sh

-6

@@ -18,7 +18,6 @@ WORKDIR="$(mktemp -d)" # Temporary folder, removed after script is done

18 VERSION="$1"

19 declare -A ARCH_MAP

20 ARCH_MAP=(["i386"]="386" ["amd64"]="amd64" ["armhf"]="arm" ["aarch64"]="arm64")

21 -DEVEL_ARCHS=(amd64)

21 [ "${ARCHS}" ] || ARCHS="${!ARCH_MAP[@]}" # Use default ARCHS unless ARCHS are externally provided

22 DOCKER_CMD="docker --config ${WORKDIR}"

23 GIT_MAIL=${GIT_MAIL:-"bot@netdata.cloud"}