From fd7fec2cbe1b64302ba8ff9c4aad29da616b6fa1 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Wed, 24 Nov 2021 20:35:54 +0000 Subject: [PATCH] Revert "added first start logic to seed db and keep state" This reverts commit ab3ac8f730f836fdec9130133477bfef35bcd8d4. --- Dockerfile | 3 +-- docker/startup.sh | 10 ---------- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 docker/startup.sh diff --git a/Dockerfile b/Dockerfile index 51eccf0..0189219 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,11 +15,10 @@ FROM debian:buster-slim RUN apt-get update && apt-get upgrade -yqq RUN apt-get install -yqq libgsasl7 && rm -rf /var/lib/apt/lists/* COPY --from=builder /usr/local/cargo/bin/diflouroborane /usr/local/bin/diflouroborane -COPY ./docker/startup.sh /startup.sh #COPY --from=builder /usr/src/bffh/examples/bffh.dhall /etc/diflouroborane.dhall # RUN diflouroborane --print-default > /etc/diflouroborane.toml VOLUME /etc/bffh/ VOLUME /var/lib/bffh/ VOLUME /usr/local/lib/bffh/adapters/ EXPOSE 59661 -ENTRYPOINT ["/bin/bash", "/startup.sh"] +ENTRYPOINT ["sh", "-c", "diflouroborane -c /etc/bffh/bffh.dhall --load=/etc/bffh; diflouroborane -c /etc/bffh/bffh.dhall"] diff --git a/docker/startup.sh b/docker/startup.sh deleted file mode 100644 index 9aef043..0000000 --- a/docker/startup.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -CONTAINER_ALREADY_STARTED="/var/lib/bffh/firststartflag" -if [ ! -e $CONTAINER_ALREADY_STARTED ]; then - touch $CONTAINER_ALREADY_STARTED - echo "-- Seeding Database --" - diflouroborane -c /etc/bffh/bffh.dhall --load=/etc/bffh -else - diflouroborane -c /etc/bffh/bffh.dhall -fi