Skip to content

Commit

Permalink
patching dockerfile for github action rebuilds
Browse files Browse the repository at this point in the history
  • Loading branch information
fredclausen committed Jul 26, 2023
1 parent 768fac9 commit 9a6f8d3
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
1 change: 1 addition & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ jobs:
# set build_latest to true if github.event.inputs.use_test_image is false
build_latest: ${{ github.event.inputs.use_test_image == 'false' }}
build_baseimage_test: ${{ github.event.inputs.use_test_image == 'true' }}
build_image_url: "s/docker-baseimage:base/docker-baseimage:base-test-pr/g"
secrets:
ghcr_token: ${{ secrets.GITHUB_TOKEN }}
dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
Expand Down
28 changes: 14 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ RUN set -x && \
# install prereqs
apt-get update && \
apt-get install -y --no-install-recommends \
binutils \
gnupg \
xz-utils \
&& \
binutils \
gnupg \
xz-utils \
&& \
# add rb24 repo
dpkg --add-architecture armhf && \
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 1D043681 && \
Expand All @@ -20,8 +20,8 @@ RUN set -x && \
# download rbfeeder deb
pushd /tmp && \
apt-get download \
rbfeeder:armhf \
&& \
rbfeeder:armhf \
&& \
# extract rbfeeder deb
ls -lah && \
ar xv ./rbfeeder_*armhf.deb && \
Expand Down Expand Up @@ -72,17 +72,17 @@ RUN set -x && \
# install packages
apt-get update && \
apt-get install -y --no-install-recommends \
"${KEPT_PACKAGES[@]}" \
"${TEMP_PACKAGES[@]}" \
&& \
"${KEPT_PACKAGES[@]}" \
"${TEMP_PACKAGES[@]}" \
&& \
# get mlat-client
BRANCH_MLAT_CLIENT=$(git -c 'versionsort.suffix=-' ls-remote --tags --sort='v:refname' 'https://github.com/mutability/mlat-client.git' | cut -d '/' -f 3 | grep '^v.*' | tail -1) && \
git clone \
--branch "$BRANCH_MLAT_CLIENT" \
--depth 1 --single-branch \
'https://github.com/mutability/mlat-client.git' \
/src/mlat-client \
&& \
--branch "$BRANCH_MLAT_CLIENT" \
--depth 1 --single-branch \
'https://github.com/mutability/mlat-client.git' \
/src/mlat-client \
&& \
pushd /src/mlat-client && \
echo "mlat-client $(git log | head -1)" >> /VERSIONS && \
python3 /src/mlat-client/setup.py build && \
Expand Down

0 comments on commit 9a6f8d3

Please sign in to comment.