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

App Updates and Balena Blocks Changes #68

Merged
merged 10 commits into from
Nov 21, 2022
Merged

App Updates and Balena Blocks Changes #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8c5e28d
Update FR24Feed Version (#3)
schubydoo Nov 20, 2022
5365335
Update MLAT Tag to latest (#4)
schubydoo Nov 20, 2022
8fcc6e5
Update READSB Version
schubydoo Nov 20, 2022
8d468d6
Update repo source file (and small typo fix)
schubydoo Nov 20, 2022
3df9d7f
Update traefik to v2.9.5
schubydoo Nov 20, 2022
2000a3a
Update traefik github URL
schubydoo Nov 20, 2022
9d6943f
Update minimum binary used (armv6)
schubydoo Nov 20, 2022
87156a2
Updating URL (balenalabs)
schubydoo Nov 20, 2022
4e85e09
Updating URL (balenalabs)
schubydoo Nov 20, 2022
7c68c48
Updating URL (balenalabs)
schubydoo Nov 20, 2022
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
2 changes: 1 addition & 1 deletion adsb-exchange/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN apt update && \

FROM base AS buildstep

ARG READSB_COMMIT=705816bc54747d7fa8212fa66dc4e819204d655e
ARG READSB_COMMIT=a25f8ea9c8427ad1bea82f244b7967ac8cd3153f
ARG MLAT_TAG=v0.4.2
ARG TEMP_INSTALL="git build-essential debhelper libncurses5-dev zlib1g-dev python3-dev libzstd-dev"

Expand Down
2 changes: 1 addition & 1 deletion balena-dash/fbcp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM bhcr.io/balenablocks/fbcp/1.0.2
FROM bhcr.io/balenalabs/fbcp/1.0.2
2 changes: 1 addition & 1 deletion balena-dash/kiosk/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bh.cr/balenablocks/browser-%%BALENA_ARCH%%/2.4.5
FROM bh.cr/balenalabs/browser-%%BALENA_ARCH%%/2.4.5

RUN install_packages cec-utils

2 changes: 1 addition & 1 deletion balena-dash/wifi-connect/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM balenablocks/wifi-connect:%%BALENA_ARCH%%
FROM bh.cr/balenalabs/wifi-connect-%%BALENA_ARCH%%
4 changes: 2 additions & 2 deletions fr24feed/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ LABEL maintainer="https://github.com/ketilmo"

EXPOSE 8754

ENV FR24FEED_VERSION=1.0.29-10
ENV FR24FEED_VERSION=1.0.30-3
ENV FR24_KEY=
ENV RECEIVER_HOST=dump1090-fa
ENV RECEIVER_PORT=30005
Expand Down Expand Up @@ -38,4 +38,4 @@ RUN chmod +x /start.sh && \
chmod +x /usr/bin/fr24feed && \
rm -rf /tmp/*

ENTRYPOINT ["/usr/bin/tini", "--", "/start.sh"]
ENTRYPOINT ["/usr/bin/tini", "--", "/start.sh"]
4 changes: 2 additions & 2 deletions radarbox/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN apt update && \

FROM base AS buildstep

ARG MLAT_TAG=v0.3.9
ARG MLAT_TAG=v0.4.2
ARG TEMP_INSTALL="build-essential debhelper python3-dev git"

RUN apt update && \
Expand Down Expand Up @@ -55,4 +55,4 @@ RUN mkdir -p /var/radarbox/thermal/thermal_zone0/ && \
chmod +x /showkey.sh && \
rm -rf /tmp/*

ENTRYPOINT ["/start.sh"]
ENTRYPOINT ["/start.sh"]
6 changes: 3 additions & 3 deletions radarbox/radarbox_installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 1D043681
/bin/rm -f /etc/apt/sources.list.d/rb24.list

# Create a new debian repository source file
echo 'deb https://apt.rb24.com/ buster main' > /etc/apt/sources.list.d/rb24.list
echo 'deb https://apt.rb24.com/ bullseye main' > /etc/apt/sources.list.d/rb24.list

arch="$(dpkg --print-architecture)"
echo System Architecture: $arch

# If host architecture is i386, amd64, or arm6 install armhf-version of RadarBox and run it throug software emulation.
# If host architecture is i386, amd64, or arm6 install armhf-version of RadarBox and run it through software emulation.
if [ "$arch" = "i386" ] || [ "$arch" = "amd64" ]; then
dpkg --add-architecture armhf
apt update && apt install -y --no-install-recommends \
Expand All @@ -29,4 +29,4 @@ else
fi

apt clean && apt autoclean && apt autoremove && \
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/*
2 changes: 1 addition & 1 deletion traefik/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN apt update && \

FROM base AS buildstep

ARG TRAEFIK_VERSION=2.9.1
ARG TRAEFIK_VERSION=2.9.5
ARG TEMP_INSTALL="wget"

COPY traefik_installer.sh /tmp
Expand Down
4 changes: 2 additions & 2 deletions traefik/traefik_installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ if [ "$arch" = "arm64" ]; then
elif [ "$arch" = "amd64" ]; then
traefik_arch="amd64"
else
traefik_arch="armv5"
traefik_arch="armv6"
fi

traefik_packet="traefik_v${TRAEFIK_VERSION}_linux_$traefik_arch.tar.gz"

cd /tmp/ && wget --quiet -O traefik.tar.gz "https://github.com/containous/traefik/releases/download/v${TRAEFIK_VERSION}/$traefik_packet";
cd /tmp/ && wget --quiet -O traefik.tar.gz "https://github.com/traefik/traefik/releases/download/v${TRAEFIK_VERSION}/$traefik_packet";