Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates debian base and tools #9

Merged
merged 1 commit into from
Oct 23, 2024
+12 −8
Merged

Updates debian base and tools #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:stable-20230814-slim
FROM debian:stable-20241016-slim

LABEL org.opencontainers.image.source="https://github.com/flipstone/haskell-tools"

Expand All @@ -7,7 +7,7 @@ ENV LANG="C.UTF-8" LANGUAGE="C.UTF-8" LC_ALL="C.UTF-8"
ARG DEBIAN_FRONTEND=noninteractive
ARG BOOTSTRAP_HASKELL_MINIMAL=1
ARG BOOTSTRAP_HASKELL_NONINTERACTIVE=1
ARG GHCUP_INSTALL_BASE_PREFIX=/usr/local
ENV GHCUP_INSTALL_BASE_PREFIX=/usr/local

ADD install-tools.sh /install-tools.sh

Expand Down Expand Up @@ -40,5 +40,9 @@ RUN ghcup install ghc $GHC_VERSION --set
ARG HLS_VERSION
RUN ghcup install hls $HLS_VERSION --set

# CABAL_VERSION is managed in tool-versions.env
ARG CABAL_VERSION
RUN ghcup install cabal $CABAL_VERSION --set

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What was the reason for installing cabal?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Want it for the Orville pipeline

ADD stack.yaml /stack.yaml
RUN /bin/sh /install-tools.sh
4 changes: 2 additions & 2 deletions stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
system-ghc: true
install-ghc: false
resolver: lts-22.22
resolver: lts-22.39
packages: []
extra-deps:
- weeder-2.8.0
- weeder-2.9.0
8 changes: 4 additions & 4 deletions tool-versions.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GHC_VERSION=9.6.5
STACK_VERSION=2.15.7
HLS_VERSION=2.8.0.0

GHC_VERSION=9.6.6
STACK_VERSION=3.1.1
HLS_VERSION=2.9.0.1
CABAL_VERSION=3.12.1.0
Loading