graham/aprs.me
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix parser version check

Browse source
This commit is contained in:
Graham McIntire 2025-07-07 14:46:31 -05:00
parent 9e63acc364
commit ba80e414d8
No known key found for this signature in database
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Dockerfile
View file

@ -29,6 +29,8 @@ RUN curl -s https://api.github.com/repos/aprsme/aprs/commits/main | grep -o '"sh
# Install dependencies
COPY mix.exs mix.lock ./
# Extract the hash from mix.lock and write to a file
RUN grep -oE 'aprs.*ref,\\s*"([a-f0-9]+)"' mix.lock | grep -oE '[a-f0-9]{7,}' | head -1 > /tmp/aprs_hash.txt
RUN mix deps.get --only $MIX_ENV
RUN mix deps.compile
@ -70,6 +72,11 @@ COPY --from=builder /tmp/parser_hash.txt /app/parser_hash.txt
# Set parser git hash environment variable for runtime
RUN PARSER_HASH=$(cat /app/parser_hash.txt) && echo "PARSER_GIT_HASH=$PARSER_HASH" >> /etc/environment
# In the runtime stage, after WORKDIR /app
COPY --from=builder /tmp/aprs_hash.txt /app/aprs_hash.txt
RUN echo "APRS_PARSER_HASH=$(cat /app/aprs_hash.txt)" >> /etc/environment
ENV APRS_PARSER_HASH="unknown"
# Copy release from builder
COPY --from=builder --chown=nobody:root /app/release ./

6
lib/aprsme/dependency_info.ex
View file

@ -40,11 +40,7 @@ defmodule Aprsme.DependencyInfo do
In production: uses the hash captured at compile time
"""
def get_aprs_library_sha do
if Application.get_env(:aprsme, :env, :dev) == :prod do
@aprs_hash
else
get_aprs_sha_from_vendor()
end
System.get_env("APRS_PARSER_HASH") || "unknown"
end
defp get_aprs_sha_from_vendor do