flora-pm / flora-server

A package index for the Haskell ecosystem
https://flora.pm/about
Other
125 stars 38 forks source link

[FLORA-368] Upgrade and unbreak docker setup for GHC 9.4.4 #370

Closed kenranunderscore closed 1 year ago

kenranunderscore commented 1 year ago

Proposed changes

I did the following and also added some minor improvements to the whole Docker setup:

  1. Pinned the base image: indeed using Ubuntu 22.04 was necessary for souffle to work/build.
  2. Introduced docker ARGS to hopefully make future GHC upgrades easier for this setup.
  3. Updated cabal-install, as it was incompatible in the default version 3.6.*.
  4. Added the missing ghcid.
  5. Rearranged and merged some Docker commands for slightly better caching and robustness.
  6. Added environment.docker.sh due to FLORA_DB_HOST having to be set differently in the docker compose setup.

Other things:

I'd be glad if you could also quickly test if it works (though it takes quite a while to get up). But note: if you have local dist-newstyle or node_modules directories, those might lead to strange git behavior inside the docker container due to permissions. It works for me if I clean beforehand.

Contributor checklist

tchoutri commented 1 year ago

@mergifyIO rebase

mergify[bot] commented 1 year ago

rebase

✅ Branch has been successfully rebased

tchoutri commented 1 year ago

@mergifyIO rebase

mergify[bot] commented 1 year ago

rebase

❌ Base branch update has failed

Git reported the following error: ``` Rebasing (1/4) The previous cherry-pick is now empty, possibly due to conflict resolution. If you wish to commit it anyway, use: git commit --allow-empty Otherwise, please use 'git rebase --skip' interactive rebase in progress; onto 7821f0a Last command done (1 command done): pick 4d73c55 [NO-ISSUE] Correct typo in mergify conf Next commands to do (3 remaining commands): pick 5df06f7 [FLORA-368] Migrate to `docker compose` pick ae795fc [FLORA-368] Do `yarn install` to unbreak `make start-tmux` (use "git rebase --edit-todo" to view and edit) You are currently rebasing branch 'update-docker-setup' on '7821f0a'. (all conflicts fixed: run "git rebase --continue") nothing to commit, working tree clean Could not apply 4d73c55... [NO-ISSUE] Correct typo in mergify conf ``` err-code: C1106