Skip to content

Commit

Permalink
remove unused uat2esnt / build deps and set build_platform_specific: …
Browse files Browse the repository at this point in the history
…false (#110)

* remove unused uat2esnt / build deps

* build_platform_specific: false

instead of this the multi-arch image is used
  • Loading branch information
wiedehopf authored Apr 29, 2024
1 parent 4370cc4 commit 22859a7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
build_baseimage_test: ${{ github.event.inputs.use_test_image == 'true' }}
# only build the entire stack if we are not using the test image
build_version_specific: ${{ github.event.inputs.use_test_image == 'false' || github.event.inputs.use_test_image == '' }}
build_platform_specific: ${{ github.event.inputs.use_test_image == 'false' || github.event.inputs.use_test_image == '' }}
build_platform_specific: false
build_nohealthcheck: ${{ github.event.inputs.use_test_image == 'false' || github.event.inputs.use_test_image == '' }}
build_baseimage_url: :wreadsb/:wreadsb-test-pr/g;s/:dump978-full/:dump978-full-test-pr
secrets:
Expand Down
17 changes: 0 additions & 17 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,8 @@ RUN set -x && \
TEMP_PACKAGES=() && \
KEPT_PACKAGES=() && \
# Essentials
TEMP_PACKAGES+=(build-essential) && \
TEMP_PACKAGES+=(ca-certificates) && \
TEMP_PACKAGES+=(cmake) && \
TEMP_PACKAGES+=(curl) && \
TEMP_PACKAGES+=(git) && \
# Required for nicer logging.
KEPT_PACKAGES+=(gawk) && \
# uat2esnt dependencies (+ telegraf)
Expand All @@ -50,7 +47,6 @@ RUN set -x && \
KEPT_PACKAGES+=(lighttpd) && \
KEPT_PACKAGES+=(lighttpd-mod-magnet) && \
# wreadsb deps
KEPT_PACKAGES+=(libncurses5) && \
KEPT_PACKAGES+=(zlib1g) && \
KEPT_PACKAGES+=(libzstd1) && \
KEPT_PACKAGES+=(libncurses6) && \
Expand All @@ -65,20 +61,7 @@ RUN set -x && \
curl -o /etc/s6-overlay/scripts/05-rtlsdr-biastee-down https://raw.githubusercontent.com/sdr-enthusiasts/sdre-bias-t-common/main/09-rtlsdr-biastee-down && \
chmod +x /etc/s6-overlay/scripts/05-rtlsdr-biastee-init && \
chmod +x /etc/s6-overlay/scripts/05-rtlsdr-biastee-down && \
git config --global advice.detachedHead false && \
# Build & install uat2esnt
git clone --branch=master --single-branch --depth=1 "https://github.com/adsbxchange/uat2esnt.git" "/src/uat2esnt" && \
pushd "/src/uat2esnt" && \
# Fix build error with bookworm
sed -i 's/ -Werror//' Makefile && \
echo "uat2esnt $(git log | head -1)" >> /VERSIONS && \
make all test && \
cp -v ./uat2text /usr/local/bin/ && \
cp -v ./uat2esnt /usr/local/bin/ && \
cp -v ./uat2json /usr/local/bin/ && \
cp -v ./extract_nexrad /usr/local/bin/ && \
mkdir -p /run/skyaware978 && \
popd && \
mkdir -p /run/stats && \
mkdir -p /run/autogain && \
##telegraf##mkdir -p /etc/telegraf/telegraf.d && \
Expand Down

0 comments on commit 22859a7

Please sign in to comment.