mirror of
https://github.com/smittix/intercept.git
synced 2026-04-24 06:40:00 -07:00
Merge upstream/main: sync fork with conflict resolution
Resolve conflicts keeping local GSM tools in kill_all() process list and weather satellite config settings while merging upstream changes including GSM spy removal, DMR fixes, USB device probe, APRS crash fix, and cross-module frequency routing. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
28
Dockerfile
28
Dockerfile
@@ -57,39 +57,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
airspy \
|
||||
limesuite \
|
||||
hackrf \
|
||||
# GSM Intelligence (tshark for packet parsing)
|
||||
tshark \
|
||||
# Utilities
|
||||
curl \
|
||||
procps \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# GSM Intelligence: gr-gsm (grgsm_scanner, grgsm_livemon)
|
||||
# Install from apt if available, otherwise build from source
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
gnuradio gr-osmosdr gr-gsm 2>/dev/null \
|
||||
|| ( \
|
||||
apt-get install -y --no-install-recommends \
|
||||
gnuradio gnuradio-dev gr-osmosdr \
|
||||
git cmake libboost-all-dev libcppunit-dev swig \
|
||||
doxygen liblog4cpp5-dev python3-scipy python3-numpy \
|
||||
libvolk-dev libfftw3-dev build-essential \
|
||||
&& cd /tmp \
|
||||
&& git clone --depth 1 https://github.com/bkerler/gr-gsm.git \
|
||||
&& cd gr-gsm \
|
||||
&& mkdir build && cd build \
|
||||
&& cmake .. \
|
||||
&& make -j$(nproc) \
|
||||
&& make install \
|
||||
&& ldconfig \
|
||||
&& rm -rf /tmp/gr-gsm \
|
||||
&& apt-get remove -y gnuradio-dev libcppunit-dev swig doxygen \
|
||||
liblog4cpp5-dev libvolk-dev build-essential git cmake \
|
||||
&& apt-get autoremove -y \
|
||||
) \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Build dump1090-fa and acarsdec from source (packages not available in slim repos)
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
build-essential \
|
||||
|
||||
Reference in New Issue
Block a user