From 33ab37e2f30401273ed2b5fc2244eb5a62fc23ec Mon Sep 17 00:00:00 2001 From: Fred Clausen <43556888+fredclausen@users.noreply.github.com> Date: Sun, 1 Dec 2024 01:21:32 -0700 Subject: [PATCH] updates --- Dockerfile.local | 104 +++++++++++++++++++++++------------------------ 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/Dockerfile.local b/Dockerfile.local index 405832a..f64ba63 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -1,68 +1,68 @@ #build acars-bridge -FROM rust:1.82.0 as builder +FROM rust:1.83.0 as builder WORKDIR /tmp/acars-bridge # hadolint ignore=DL3008,DL3003,SC1091 RUN set -x && \ - apt-get update && \ - apt-get install -y --no-install-recommends libzmq3-dev + apt-get update && \ + apt-get install -y --no-install-recommends libzmq3-dev RUN set -x && \ - git clone https://github.com/sdr-enthusiasts/acars-bridge.git . && \ - cargo build --release && \ - # clean up the apt-cache - apt-get clean && \ - rm -rf /var/lib/apt/lists/* && \ - cp /tmp/acars-bridge/target/release/acars-bridge . && \ - cargo clean + git clone https://github.com/sdr-enthusiasts/acars-bridge.git . && \ + cargo build --release && \ + # clean up the apt-cache + apt-get clean && \ + rm -rf /var/lib/apt/lists/* && \ + cp /tmp/acars-bridge/target/release/acars-bridge . && \ + cargo clean FROM ghcr.io/sdr-enthusiasts/docker-baseimage:acars-decoder ENV DEVICE_INDEX="" \ - QUIET_LOGS="TRUE" \ - FREQUENCIES="" \ - FEED_ID="" \ - PPM="0"\ - GAIN="400" \ - SERIAL="" \ - OUTPUT_SERVER="acars_router" \ - OUTPUT_SERVER_PORT="5555" \ - OUTPUT_SERVER_MODE="udp" \ - MODE="J" + QUIET_LOGS="TRUE" \ + FREQUENCIES="" \ + FEED_ID="" \ + PPM="0"\ + GAIN="400" \ + SERIAL="" \ + OUTPUT_SERVER="acars_router" \ + OUTPUT_SERVER_PORT="5555" \ + OUTPUT_SERVER_MODE="udp" \ + MODE="J" # hadolint ignore=DL3008,SC2086,SC2039,SC3054 RUN set -x && \ - TEMP_PACKAGES=() && \ - KEPT_PACKAGES=() && \ - # Required for building multiple packages. - TEMP_PACKAGES+=(build-essential) && \ - TEMP_PACKAGES+=(pkg-config) && \ - TEMP_PACKAGES+=(cmake) && \ - TEMP_PACKAGES+=(git) && \ - TEMP_PACKAGES+=(automake) && \ - TEMP_PACKAGES+=(autoconf) && \ - TEMP_PACKAGES+=(wget) && \ - # install packages - apt-get update && \ - apt-get install -y --no-install-recommends \ - "${KEPT_PACKAGES[@]}" \ - "${TEMP_PACKAGES[@]}"\ - && \ - # vdlm2dec - # git clone https://github.com/TLeconte/vdlm2dec.git /src/vdlm2dec && \ - git clone https://github.com/wiedehopf/vdlm2dec.git /src/vdlm2dec && \ - pushd /src/vdlm2dec && \ - # fix for floating point amd64 nonsense - sed -i 's/add_compile_options(-Ofast -march=native )/add_compile_options(-O2 )/g' CMakeLists.txt && \ - mkdir build && \ - pushd build && \ - cmake ../ -Drtl=ON -DCMAKE_BUILD_TYPE=Debug && \ - make && \ - make install && \ - popd && popd && \ - # Clean up - apt-get remove -y "${TEMP_PACKAGES[@]}" && \ - apt-get autoremove -y && \ - rm -rf /src/* /tmp/* /var/lib/apt/lists/* + TEMP_PACKAGES=() && \ + KEPT_PACKAGES=() && \ + # Required for building multiple packages. + TEMP_PACKAGES+=(build-essential) && \ + TEMP_PACKAGES+=(pkg-config) && \ + TEMP_PACKAGES+=(cmake) && \ + TEMP_PACKAGES+=(git) && \ + TEMP_PACKAGES+=(automake) && \ + TEMP_PACKAGES+=(autoconf) && \ + TEMP_PACKAGES+=(wget) && \ + # install packages + apt-get update && \ + apt-get install -y --no-install-recommends \ + "${KEPT_PACKAGES[@]}" \ + "${TEMP_PACKAGES[@]}"\ + && \ + # vdlm2dec + # git clone https://github.com/TLeconte/vdlm2dec.git /src/vdlm2dec && \ + git clone https://github.com/wiedehopf/vdlm2dec.git /src/vdlm2dec && \ + pushd /src/vdlm2dec && \ + # fix for floating point amd64 nonsense + sed -i 's/add_compile_options(-Ofast -march=native )/add_compile_options(-O2 )/g' CMakeLists.txt && \ + mkdir build && \ + pushd build && \ + cmake ../ -Drtl=ON -DCMAKE_BUILD_TYPE=Debug && \ + make && \ + make install && \ + popd && popd && \ + # Clean up + apt-get remove -y "${TEMP_PACKAGES[@]}" && \ + apt-get autoremove -y && \ + rm -rf /src/* /tmp/* /var/lib/apt/lists/* COPY rootfs/ /