diff --git a/build-docker.sh b/build-docker.sh index ed4d5ac..939b9c2 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -4,7 +4,7 @@ IMAGE_NAME=robocar-steering-tflite-edgetpu TAG=$(git describe) FULL_IMAGE_NAME=docker.io/cyrilix/${IMAGE_NAME}:${TAG} BINARY=rc-steering -TFLITE_VERSION=2.9.1 +TFLITE_VERSION=2.10.0 GOLANG_VERSION=1.19 GOTAGS="-tags netgo" @@ -37,7 +37,7 @@ image_build_binaries(){ printf "Compile for linux/amd64\n" LIB_ARCH=x86_64-linux-gnu LIB_FLAGS="-L /usr/local/lib/${LIB_ARCH} \ - -L/usr/local/lib/${LIB_ARCH}/absl/base -labsl_base -labsl_throw_delegate -labsl_raw_logging_internal -labsl_spinlock_wait -labsl_malloc_internal -labsl_log_severity \ + -L/usr/local/lib/${LIB_ARCH}/absl/base -labsl_base -labsl_throw_delegate -labsl_raw_logging_internal -labsl_spinlock_wait -labsl_malloc_internal -labsl_log_severity -labsl_strerror \ -L/usr/local/lib/${LIB_ARCH}/absl/status -labsl_status \ -L/usr/local/lib/${LIB_ARCH}/absl/hash -labsl_hash -labsl_city -labsl_low_level_hash \ -L/usr/local/lib/${LIB_ARCH}/absl/flags -labsl_flags -labsl_flags_internal -labsl_flags_marshalling -labsl_flags_reflection -labsl_flags_config -labsl_flags_program_name -labsl_flags_private_handle_accessor -labsl_flags_commandlineflag -labsl_flags_commandlineflag_internal\ @@ -62,37 +62,11 @@ image_build_binaries(){ go build -a -o rc-steering.amd64 ./cmd/rc-steering #--env CGO_CXXFLAGS="--std=c++1z" \ - printf "Compile for linux/arm/v7\n" - LIB_ARCH=arm-linux-gnueabihf - LIB_FLAGS="-L /usr/local/lib/${LIB_ARCH} \ - -L/usr/local/lib/${LIB_ARCH}/absl/base -labsl_base -labsl_throw_delegate -labsl_raw_logging_internal -labsl_spinlock_wait -labsl_malloc_internal -labsl_log_severity \ - -L/usr/local/lib/${LIB_ARCH}/absl/status -labsl_status \ - -L/usr/local/lib/${LIB_ARCH}/absl/hash -labsl_hash -labsl_city -labsl_low_level_hash \ - -L/usr/local/lib/${LIB_ARCH}/absl/flags -labsl_flags -labsl_flags_internal -labsl_flags_marshalling -labsl_flags_reflection -labsl_flags_config -labsl_flags_program_name -labsl_flags_private_handle_accessor -labsl_flags_commandlineflag -labsl_flags_commandlineflag_internal\ - -L/usr/local/lib/${LIB_ARCH}/absl/types -labsl_bad_variant_access -labsl_bad_optional_access -labsl_bad_any_cast_impl \ - -L/usr/local/lib/${LIB_ARCH}/absl/strings -labsl_strings -labsl_str_format_internal -labsl_cord -labsl_cordz_info -labsl_cord_internal -labsl_cordz_functions -labsl_cordz_handle -labsl_strings_internal \ - -L/usr/local/lib/${LIB_ARCH}/absl/time -labsl_time -labsl_time_zone -labsl_civil_time \ - -L/usr/local/lib/${LIB_ARCH}/absl/numeric -labsl_int128 \ - -L/usr/local/lib/${LIB_ARCH}/absl/synchronization -labsl_synchronization -labsl_graphcycles_internal\ - -L/usr/local/lib/${LIB_ARCH}/absl/debugging -labsl_stacktrace -labsl_symbolize -labsl_debugging_internal -labsl_demangle_internal \ - -L/usr/local/lib/${LIB_ARCH}/absl/profiling -labsl_exponential_biased \ - -L/usr/local/lib/${LIB_ARCH}/absl/container -labsl_raw_hash_set -labsl_hashtablez_sampler" - buildah run \ - --env CGO_ENABLED=1 \ - --env CC=arm-linux-gnueabihf-gcc \ - --env CXX=arm-linux-gnueabihf-g++ \ - --env GOOS=linux \ - --env GOARCH=arm \ - --env GOARM=7 \ - --env CGO_CPPFLAGS="-I/usr/local/include" \ - --env CGO_LDFLAGS="${LIB_FLAGS}" \ - $containerName \ - go build -a -o rc-steering.armhf ./cmd/rc-steering printf "Compile for linux/arm64\n" LIB_ARCH=aarch64-linux-gnu LIB_FLAGS="-L /usr/local/lib/${LIB_ARCH} \ - -L/usr/local/lib/${LIB_ARCH}/absl/base -labsl_base -labsl_throw_delegate -labsl_raw_logging_internal -labsl_spinlock_wait -labsl_malloc_internal -labsl_log_severity \ + -L/usr/local/lib/${LIB_ARCH}/absl/base -labsl_base -labsl_throw_delegate -labsl_raw_logging_internal -labsl_spinlock_wait -labsl_malloc_internal -labsl_log_severity -labsl_strerror\ -L/usr/local/lib/${LIB_ARCH}/absl/status -labsl_status \ -L/usr/local/lib/${LIB_ARCH}/absl/hash -labsl_hash -labsl_city -labsl_low_level_hash \ -L/usr/local/lib/${LIB_ARCH}/absl/flags -labsl_flags -labsl_flags_internal -labsl_flags_marshalling -labsl_flags_reflection -labsl_flags_config -labsl_flags_program_name -labsl_flags_private_handle_accessor -labsl_flags_commandlineflag -labsl_flags_commandlineflag_internal\ @@ -152,7 +126,6 @@ image_build_binaries image_build linux/amd64 image_build linux/arm64 -image_build linux/arm/v7 # push image