Commit 64329d56 authored by aguestuser's avatar aguestuser
Browse files

Merge branch 'hotfix-restore-refined-catch-blocks-for-common-signald-crashes' into 'master'

[hotfix] signald: restore refined catch blocks

See merge request team-friendo/signalboost!363
parents 46e6fcdd 587b4124
......@@ -46,19 +46,7 @@ ENV LC_CTYPE en_US.UTF-8
# Signald attachments break if we use jdk11 (why?!??),
# but buster does not provide a jdk8 installation candidate,
# so we grab one from sid package repository...
#RUN echo "deb http://ftp.us.debian.org/debian sid main" \
# | tee -a /etc/apt/sources.list \
# && apt-get update -qq
# We install sudo as a hack to get around halting errors
# in make commands that (needlessly) invoke it
#RUN apt-get update -qq
#RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
# openjdk-8-jdk-headless \
# sudo
#ENV JAVA_HOME "/usr/lib/jvm/java-8-openjdk-amd64"
# so we grab one from jfrog.io...
RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add -
RUN add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
......@@ -70,20 +58,15 @@ ENV JAVA_HOME "/usr/lib/jvm/adoptopenjdk-8-hotspot-amd64"
# --- Install and Configure Signald (from source)
# ------------------------------------------------------
# hack to avoid halting error on (unnecessary) `sudo` invocations
# We install sudo as a hack to get around halting errors
# in make commands that (needlessly) invoke it
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y sudo
# build signald from a given commit hash
# head of upstream master as of 2020-0709 --v
# ENV REPO_URL "https://git.callpipe.com/finn/signald.git"
# ENV COMMIT_HASH "d709c3face5b027c087c6ed71991b0821d448e28"
# ENV BRANCH "master"
# fork currently running on prod ---v
ENV REPO_URL "https://0xacab.org/team-friendo/signald-fork.git"
ENV BRANCH "master"
ENV COMMIT_HASH "6c2d9e63d38a2a3731445fd97641cd9a4d0e528c"
ENV COMMIT_HASH "e284165b58a9983abb0bf70bf83d9ecfef945369"
# fetch repo at desired commit
RUN git init && \
......@@ -108,4 +91,4 @@ ENTRYPOINT /signalboost/bin/entrypoint/signald
# ------------------
# Version
# ------------------
LABEL verson="1.0.5"
LABEL verson="1.0.6"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment