mirror of
https://github.com/sdr-enthusiasts/docker-adsb-ultrafeeder.git
synced 2024-11-21 21:30:11 +00:00
dockerfile formatting, correct names for test tags
This commit is contained in:
parent
6651974bb8
commit
cf0d91ba84
2 changed files with 23 additions and 23 deletions
4
.github/workflows/deploy.yml
vendored
4
.github/workflows/deploy.yml
vendored
|
@ -81,7 +81,7 @@ jobs:
|
||||||
build_version_specific: false
|
build_version_specific: false
|
||||||
build_platform_specific: false
|
build_platform_specific: false
|
||||||
build_nohealthcheck: false
|
build_nohealthcheck: false
|
||||||
build_baseimage_url: docker-tar1090:latest/docker-tar1090:baseimage_test
|
build_baseimage_url: docker-tar1090:latest/docker-tar1090:baseimage-test
|
||||||
secrets:
|
secrets:
|
||||||
ghcr_token: ${{ secrets.GITHUB_TOKEN }}
|
ghcr_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
@ -100,7 +100,7 @@ jobs:
|
||||||
# set build_latest to true if github.event.inputs.use_test_image is false
|
# set build_latest to true if github.event.inputs.use_test_image is false
|
||||||
build_latest: ${{ github.event.inputs.use_test_image == 'false' }}
|
build_latest: ${{ github.event.inputs.use_test_image == 'false' }}
|
||||||
build_baseimage_test: ${{ github.event.inputs.use_test_image == 'true' }}
|
build_baseimage_test: ${{ github.event.inputs.use_test_image == 'true' }}
|
||||||
build_baseimage_url: docker-tar1090:latest/docker-tar1090:telegraf_baseimage_test
|
build_baseimage_url: docker-tar1090:latest/docker-tar1090:telegraf-baseimage-test
|
||||||
# only build the entire stack if we are not using the test image
|
# only build the entire stack if we are not using the test image
|
||||||
build_version_specific: false
|
build_version_specific: false
|
||||||
build_platform_specific: false
|
build_platform_specific: false
|
||||||
|
|
42
Dockerfile
42
Dockerfile
|
@ -9,13 +9,13 @@ ENV URL_MLAT_CLIENT_REPO="https://github.com/wiedehopf/mlat-client.git" \
|
||||||
RUN set -x && \
|
RUN set -x && \
|
||||||
TEMP_PACKAGES=() && \
|
TEMP_PACKAGES=() && \
|
||||||
KEPT_PACKAGES=() && \
|
KEPT_PACKAGES=() && \
|
||||||
# Git and net-tools are needed to install and run @Mikenye's HealthCheck framework
|
# Git and net-tools are needed to install and run @Mikenye's HealthCheck framework
|
||||||
KEPT_PACKAGES+=(git) && \
|
KEPT_PACKAGES+=(git) && \
|
||||||
#
|
#
|
||||||
# Needed to run the mlat_client:
|
# Needed to run the mlat_client:
|
||||||
POST_PACKAGES+=(python3-minimal) && \
|
POST_PACKAGES+=(python3-minimal) && \
|
||||||
#
|
#
|
||||||
# These are needed to compile and install the mlat_client:
|
# These are needed to compile and install the mlat_client:
|
||||||
TEMP_PACKAGES+=(python3) && \
|
TEMP_PACKAGES+=(python3) && \
|
||||||
TEMP_PACKAGES+=(build-essential) && \
|
TEMP_PACKAGES+=(build-essential) && \
|
||||||
TEMP_PACKAGES+=(debhelper) && \
|
TEMP_PACKAGES+=(debhelper) && \
|
||||||
|
@ -24,34 +24,34 @@ RUN set -x && \
|
||||||
TEMP_PACKAGES+=(python3-pip) && \
|
TEMP_PACKAGES+=(python3-pip) && \
|
||||||
TEMP_PACKAGES+=(python3-setuptools) && \
|
TEMP_PACKAGES+=(python3-setuptools) && \
|
||||||
TEMP_PACKAGES+=(python3-wheel) && \
|
TEMP_PACKAGES+=(python3-wheel) && \
|
||||||
#
|
#
|
||||||
# packages needed for debugging - these can stay out in production builds:
|
# packages needed for debugging - these can stay out in production builds:
|
||||||
#KEPT_PACKAGES+=(procps nano aptitude psmisc) && \
|
#KEPT_PACKAGES+=(procps nano aptitude psmisc) && \
|
||||||
# Install all these packages:
|
# Install all these packages:
|
||||||
apt-get update -q -y && \
|
apt-get update -q -y && \
|
||||||
apt-get install -o Dpkg::Options::="--force-confnew" -y --no-install-recommends -q \
|
apt-get install -o Dpkg::Options::="--force-confnew" -y --no-install-recommends -q \
|
||||||
${KEPT_PACKAGES[@]} \
|
${KEPT_PACKAGES[@]} \
|
||||||
${TEMP_PACKAGES[@]} && \
|
${TEMP_PACKAGES[@]} && \
|
||||||
#
|
#
|
||||||
# Compile and Install the mlat_client
|
# Compile and Install the mlat_client
|
||||||
mkdir -p /git && \
|
mkdir -p /git && \
|
||||||
pushd /git && \
|
pushd /git && \
|
||||||
git clone --depth 1 $URL_MLAT_CLIENT_REPO && \
|
git clone --depth 1 $URL_MLAT_CLIENT_REPO && \
|
||||||
cd mlat-client && \
|
cd mlat-client && \
|
||||||
./setup.py install && \
|
./setup.py install && \
|
||||||
ln -s /usr/local/bin/mlat-client /usr/bin/mlat-client && \
|
ln -s /usr/local/bin/mlat-client /usr/bin/mlat-client && \
|
||||||
popd && \
|
popd && \
|
||||||
rm -rf /git && \
|
rm -rf /git && \
|
||||||
#
|
#
|
||||||
# Clean up and install POST_PACKAGES:
|
# Clean up and install POST_PACKAGES:
|
||||||
apt-get remove -q -y ${TEMP_PACKAGES[@]} && \
|
apt-get remove -q -y ${TEMP_PACKAGES[@]} && \
|
||||||
apt-get install -o Dpkg::Options::="--force-confnew" -y --no-install-recommends -q \
|
apt-get install -o Dpkg::Options::="--force-confnew" -y --no-install-recommends -q \
|
||||||
${POST_PACKAGES[@]} && \
|
${POST_PACKAGES[@]} && \
|
||||||
apt-get autoremove -q -o APT::Autoremove::RecommendsImportant=0 -o APT::Autoremove::SuggestsImportant=0 -y && \
|
apt-get autoremove -q -o APT::Autoremove::RecommendsImportant=0 -o APT::Autoremove::SuggestsImportant=0 -y && \
|
||||||
apt-get clean -q -y && \
|
apt-get clean -q -y && \
|
||||||
rm -rf /src /tmp/* /var/lib/apt/lists/* /git && \
|
rm -rf /src /tmp/* /var/lib/apt/lists/* /git && \
|
||||||
#
|
#
|
||||||
# Do some stuff for kx1t's convenience:
|
# Do some stuff for kx1t's convenience:
|
||||||
echo "alias dir=\"ls -alsv\"" >> /root/.bashrc && \
|
echo "alias dir=\"ls -alsv\"" >> /root/.bashrc && \
|
||||||
echo "alias nano=\"nano -l\"" >> /root/.bashrc
|
echo "alias nano=\"nano -l\"" >> /root/.bashrc
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue