Skip to content

Commit

Permalink
Merged PR 5695: Fix pylon 5 aarch64 docker build and update changelog
Browse files Browse the repository at this point in the history
Fix pylon 5 aarch64 docker build and update changelog
  • Loading branch information
Klug, Stefan authored and Klug, Stefan committed Nov 12, 2019
1 parent fff2aa6 commit 409c5e0
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
3 changes: 2 additions & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
Version 1.5.1
- Date 2019-10-17
- Date 2019-11-12
- Fixed travis and appveyor builds for windows and linux
- Added preliminary pylon 6 support for linux
- Dropped python 2.7 support
- Fixed GetBuffer in PylonImage

Version 1.5.0
- Date 2019-09-18
Expand Down
8 changes: 8 additions & 0 deletions scripts/build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ FROM multiarch/qemu-user-static:4.1.0-1 as qemu
FROM $DOCKER_BASE_IMAGE
COPY --from=qemu /usr/bin/* /usr/bin/

# Quick fix for the now archived debian jessie. Security updates are also no longer provided for arm64.
# We switch all sources to the debian archive servers, See:
# https://github.com/debuerreotype/docker-debian-artifacts/issues/66
# https://stackoverflow.com/questions/55386246/w-failed-to-fetch-http-deb-debian-org-debian-dists-jessie-updates-main-binary
RUN if cat /etc/debian_version | grep -q "8\." ; then \
echo "deb [check-valid-until=no] http://archive.debian.org/debian jessie main" > /etc/apt/sources.list; \
apt-get -o Acquire::Check-Valid-Until=false update; \
fi

RUN pip install wheel
#build a new swig
Expand Down
9 changes: 5 additions & 4 deletions scripts/build/build-arch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,13 @@ PYTHON="python"
PYLON_ARCH=""
PYLON=""

#Note: Be careful when changing the base image. Not every image is available for every architecture.
case $ABI_TAG in
cp27m) BASE_IMAGE="python:2.7.16-jessie" ;;
cp34m) BASE_IMAGE="python:3.4.8-jessie" ;;
cp35m) BASE_IMAGE="python:3.5.6-jessie" ;;
cp36m) BASE_IMAGE="python:3.6.4-jessie" ;;
cp37m) BASE_IMAGE="python:3.7.2-stretch" ;;
cp35m) BASE_IMAGE="python:3.5.5-jessie" ;;
cp36m) BASE_IMAGE="python:3.6.5-jessie" ;;
cp37m) BASE_IMAGE="python:3.7.5-stretch" ;;
*)
echo "Unsupported abi '$ABI_TAG'. Supported tags: cp27m,cp34m,cp35m,cp36m,cp37m"
exit 1
Expand All @@ -72,7 +73,7 @@ if [ -n "$PYLON_DIR" ]; then

#special case for pylon 5.x where aarch64 was named arm64
if [ ! -f "$PYLON" -a $PYLON_ARCH == "aarch64" ]; then
files=( $PYLON_DIR/pylon-*-arm64.txar.gz )
files=( $PYLON_DIR/pylon-*-arm64.tar.gz )
PYLON="${files[0]}"
fi

Expand Down

0 comments on commit 409c5e0

Please sign in to comment.