I did the following and also added some minor improvements to the whole Docker setup:
Pinned the base image: indeed using Ubuntu 22.04 was necessary for souffle to work/build.
Introduced docker ARGS to hopefully make future GHC upgrades easier for this setup.
Updated cabal-install, as it was incompatible in the default version 3.6.*.
Added the missing ghcid.
Rearranged and merged some Docker commands for slightly better caching and robustness.
Added environment.docker.sh due to FLORA_DB_HOST having to be set differently in the docker compose setup.
Other things:
I had to do yarn install in the start-tmux.sh script, or otherwise the make start-tmux would crash with missing dependencies.
Migrated from the deprecated, standalone docker-compose to the docker compose command.
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.
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
Proposed changes
I did the following and also added some minor improvements to the whole Docker setup:
souffle
to work/build.ARGS
to hopefully make future GHC upgrades easier for this setup.cabal-install
, as it was incompatible in the default version 3.6.*.ghcid
.environment.docker.sh
due toFLORA_DB_HOST
having to be set differently in the docker compose setup.Other things:
yarn install
in thestart-tmux.sh
script, or otherwise themake start-tmux
would crash with missing dependencies.docker-compose
to thedocker compose
command.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
ornode_modules
directories, those might lead to strangegit
behavior inside the docker container due to permissions. It works for me if I clean beforehand.Contributor checklist