openstack
/
monasca-agent
Code Issues Proposed changes

Fix Docker builds 

The default nodeset was just changed to focal [1], which in the absence
of the python-is-python3 package doesn't provide a python binary.

[1] https://review.opendev.org/c/opendev/base-jobs/+/789098

Change-Id: I70984db7af7ce5f7028077db4debcd2cd9bd7c45
This commit is contained in:
Pierre Riteau 2021-05-20 17:11:37 +02:00
parent cefab7f3e8
commit 7d21e505e8
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/build_image.sh
View File

@ -48,7 +48,7 @@ set -eo pipefail # Exit the script if any statement returns error.
# $ ./build_image.sh master master refs/changes/19/595719/3
# Go to folder with Docker files.
REAL_PATH=$(python -c "import os,sys; print(os.path.realpath('$0'))")
REAL_PATH=$(python3 -c "import os,sys; print(os.path.realpath('$0'))")
cd "$(dirname "$REAL_PATH")/../docker/"
./collector/build_image.sh "$@"

2
docker/collector/build_image.sh
View File

@ -45,7 +45,7 @@ set -eo pipefail # Exit the script if any statement returns error.
# $ ./build_image.sh master master refs/changes/19/595719/3
# Go to folder with Docker files.
REAL_PATH=$(python -c "import os,sys; print(os.path.realpath('$0'))")
REAL_PATH=$(python3 -c "import os,sys; print(os.path.realpath('$0'))")
cd "$(dirname "$REAL_PATH")/../collector/"
[ -z "$DOCKER_IMAGE" ] && \

2
docker/forwarder/build_image.sh
View File

@ -45,7 +45,7 @@ set -eo pipefail # Exit the script if any statement returns error.
# $ ./build_image.sh master master refs/changes/19/595719/3
# Go to folder with Docker files.
REAL_PATH=$(python -c "import os,sys; print(os.path.realpath('$0'))")
REAL_PATH=$(python3 -c "import os,sys; print(os.path.realpath('$0'))")
cd "$(dirname "$REAL_PATH")/../forwarder/"
[ -z "$DOCKER_IMAGE" ] && \

2
docker/statsd/build_image.sh
View File

@ -45,7 +45,7 @@ set -eo pipefail # Exit the script if any statement returns error.
# $ ./build_image.sh master master refs/changes/19/595719/3
# Go to folder with Docker files.
REAL_PATH=$(python -c "import os,sys; print(os.path.realpath('$0'))")
REAL_PATH=$(python3 -c "import os,sys; print(os.path.realpath('$0'))")
cd "$(dirname "$REAL_PATH")/../statsd/"
[ -z "$DOCKER_IMAGE" ] && \