Currently, 4 branches are being used with slightly different Dockerfile, Makefile, and docker-compose files. One plan is the following:
We could streamline this by unifying these three files so that they should be the same in all branches
main and dev still are used for pushing new images up to AWS through actions
Future feature branches can branch off dev cleanly, hopefully making merge from dev to main easier too
Maybe this will need some kind of extra argument during the make and make run steps so that you can point any build to use 1) main AWS, 2) dev AWS, 3) local build
Currently, 4 branches are being used with slightly different Dockerfile, Makefile, and docker-compose files. One plan is the following:
mainanddevstill are used for pushing new images up to AWS through actionsdevcleanly, hopefully making merge fromdevtomaineasier toomakeandmake runsteps so that you can point any build to use 1) main AWS, 2) dev AWS, 3) local build