Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add git a temporary package as it's no longer in docker-tar1090 #100

Merged
merged 1 commit into from
Jun 11, 2024
Merged

add git a temporary package as it's no longer in docker-tar1090 #100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ RUN \
KEPT_PACKAGES+=(python3-pkg-resources) && \
# needed to compile distance
TEMP_PACKAGES+=(build-essential) && \
# needed for container version
TEMP_PACKAGES+=(git) && \
#
# packages needed for debugging - these can stay out in production builds:
#KEPT_PACKAGES+=(procps nano aptitude psmisc) && \
Expand All @@ -32,6 +34,13 @@ RUN \
ln -s /usr/local/bin/mlat-client /usr/bin/mlat-client && \
# Compile distance binary
gcc -static /app/downloads/distance-in-meters.c -o /usr/local/bin/distance -lm -O2 && \
# Add Container Version
branch="##BRANCH##" && \
[[ "${branch:0:1}" == "#" ]] && branch="main" || true && \
git clone --depth=1 -b "$branch" https://github.com/sdr-enthusiasts/docker-adsb-ultrafeeder.git /tmp/clone && \
pushd /tmp/clone && \
echo "$(TZ=UTC date +%Y%m%d-%H%M%S)_$(git rev-parse --short HEAD)_$(git branch --show-current)" > /.CONTAINER_VERSION && \
popd && \
# Clean up and install POST_PACKAGES:
apt-get remove -q -y "${TEMP_PACKAGES[@]}" && \
# apt-get install -o Dpkg::Options::="--force-confnew" -y --no-install-recommends -q \
Expand All @@ -49,13 +58,3 @@ RUN \
echo "alias nano=\"nano -l\"" >> /root/.bashrc

COPY rootfs/ /

# Add Container Version
RUN set -x && \
branch="##BRANCH##" && \
[[ "${branch:0:1}" == "#" ]] && branch="main" || true && \
git clone --depth=1 -b "$branch" https://github.com/sdr-enthusiasts/docker-adsb-ultrafeeder.git /tmp/clone && \
pushd /tmp/clone && \
echo "$(TZ=UTC date +%Y%m%d-%H%M%S)_$(git rev-parse --short HEAD)_$(git branch --show-current)" > /.CONTAINER_VERSION && \
popd && \
rm -rf /tmp/*