From dc2a4eecfa3b8463867ca0d2424ee14fb5763b3f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 18 Sep 2023 16:17:17 +0800 Subject: [PATCH 1/2] Dockerfile.runtime: just use latest image --- .github/workflows/Dockerfile.runtime | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Dockerfile.runtime b/.github/workflows/Dockerfile.runtime index f0b9e85..ab0d5ce 100644 --- a/.github/workflows/Dockerfile.runtime +++ b/.github/workflows/Dockerfile.runtime @@ -1,10 +1,10 @@ -FROM ghcr.io/commercialhaskell/curator/base-build:9538a9167251c0b06557b685d9fab6dc91b577bb as build-app +FROM ghcr.io/commercialhaskell/curator/base-build as build-app RUN mkdir -p /artifacts/bin COPY . /src RUN stack install --stack-yaml /src/stack.yaml --local-bin-path /artifacts/bin -FROM ghcr.io/commercialhaskell/curator/base-run:9538a9167251c0b06557b685d9fab6dc91b577bb +FROM ghcr.io/commercialhaskell/curator/base-run RUN mkdir -p /app/db COPY --from=build-app /artifacts/bin/casa-curator /usr/local/bin/casa-curator From 324de719bd58f6c8e70f769a66a5870f1009fde5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 18 Sep 2023 16:17:52 +0800 Subject: [PATCH 2/2] Dockerfile.base-build: use apt and install pkg-config needed for building digest --- .github/workflows/Dockerfile.base-build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Dockerfile.base-build b/.github/workflows/Dockerfile.base-build index dc7d3fb..ce37d6e 100644 --- a/.github/workflows/Dockerfile.base-build +++ b/.github/workflows/Dockerfile.base-build @@ -2,8 +2,9 @@ FROM fpco/pid1:20.04 ENV LANG C.UTF-8 RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install curl -y && \ + apt update && \ + apt upgrade && \ + apt install curl pkg-config -y && \ curl -sSL https://get.haskellstack.org/ | sh && \ unset DEBIAN_FRONTEND RUN stack update