Merge pull request #35 from juhp/image-tweaks

more Dockerfile tweaks
commercialhaskell · Sep 18, 2023 · 13727fd · 13727fd
2 parents b3ea851 + 324de71
commit 13727fd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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

diff --git 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