Browse Source

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

Konstantinos Natsakis 4 years ago
parent
commit
59916b01b8
3 changed files with 2 additions and 13 deletions
  1. 2 1
      .travis.yml
  2. 0 6
      packaging/docker/build.sh
  3. 0 6
      packaging/docker/publish.sh

+ 2 - 1
.travis.yml

@@ -103,7 +103,8 @@ jobs:
 
     - name: Docker container build process (alpine installation)
       script: packaging/docker/build.sh
-      env: DEVEL="true"
+      env:
+        - ARCH=amd64
       after_failure: post_message "TRAVIS_MESSAGE" "Docker build process failed"
 
     - name: Build/Install for ubuntu 18.04 (not containerized)

+ 0 - 6
packaging/docker/build.sh

@@ -16,7 +16,6 @@ fi
 VERSION="$1"
 declare -A ARCH_MAP
 ARCH_MAP=(["i386"]="386" ["amd64"]="amd64" ["armhf"]="arm" ["aarch64"]="arm64")
-DEVEL_ARCHS=(amd64)
 [ "${ARCHS}" ] || ARCHS="${!ARCH_MAP[@]}" # Use default ARCHS unless ARCHS are externally provided
 
 if [ "${RELEASE_CHANNEL}" != "nightly" ] && [ "${RELEASE_CHANNEL}" != "stable" ]; then
@@ -34,11 +33,6 @@ if [ -z ${REPOSITORY} ]; then
 	fi
 fi
 
-# When development mode is set, build on DEVEL_ARCHS
-if [ ! -z ${DEVEL+x} ]; then
-    declare -a ARCHS=(${DEVEL_ARCHS[@]})
-fi
-
 # Ensure there is a version, the most appropriate one
 if [ "${VERSION}" == "" ]; then
     VERSION=$(git tag --points-at)

+ 0 - 6
packaging/docker/publish.sh

@@ -18,7 +18,6 @@ WORKDIR="$(mktemp -d)" # Temporary folder, removed after script is done
 VERSION="$1"
 declare -A ARCH_MAP
 ARCH_MAP=(["i386"]="386" ["amd64"]="amd64" ["armhf"]="arm" ["aarch64"]="arm64")
-DEVEL_ARCHS=(amd64)
 [ "${ARCHS}" ] || ARCHS="${!ARCH_MAP[@]}" # Use default ARCHS unless ARCHS are externally provided
 DOCKER_CMD="docker --config ${WORKDIR}"
 GIT_MAIL=${GIT_MAIL:-"bot@netdata.cloud"}
@@ -34,11 +33,6 @@ if [ -z ${REPOSITORY} ]; then
 	fi
 fi
 
-# When development mode is set, build on DEVEL_ARCHS
-if [ ! -z ${DEVEL+x} ]; then
-    declare -a ARCHS=(${DEVEL_ARCHS[@]})
-fi
-
 # Ensure there is a version, the most appropriate one
 if [ "${VERSION}" == "" ]; then
     VERSION=$(git tag --points-at)