diff options
| author | Konstantinos Natsakis <5933427+knatsakis@users.noreply.github.com> | 2020-04-14 19:00:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 19:00:17 +0300 |
| commit | 59916b01b83026d6e6caf59f4efb67b7d428b70d (patch) | |
| tree | 1ae04fded0b094604cba03c6d8e785c63f76b322 | |
| parent | e4f320ab6170d2a71593340a19f7b155c6dc7601 (diff) | |
packaging/docker/{build,publish}.sh: Remove DEVEL support (#8702)
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | packaging/docker/build.sh | 6 | ||||
| -rwxr-xr-x | packaging/docker/publish.sh | 6 |
3 files changed, 2 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 98b5919846..1031274b97 100644 --- a/.travis.yml +++ b/.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) diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh index a1e6f6481f..69323ef7e4 100755 --- a/packaging/docker/build.sh +++ b/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) diff --git a/packaging/docker/publish.sh b/packaging/docker/publish.sh index f82ca1eafa..30ee850dfe 100755 --- a/packaging/docker/publish.sh +++ b/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) |