diff --git a/gogocarto/README.org b/gogocarto/README.org index 05e1047..3e60111 100644 --- a/gogocarto/README.org +++ b/gogocarto/README.org @@ -21,20 +21,23 @@ This process will ensure to avoid rebuilding the gigantic intermediate image needed (with apache and build/install tools). You need to run this from the root of a code checkout of: -https://gitlab.adullact.net/pixelhumain/GoGoCarto +https://gitlab.com/Seballot/gogocarto, on the version you want to +produce a release from. #+begin_src sh -docker_tree_hash=$(git rev-parse HEAD:docker) -## Intermediate docker image is cached on docker.0k.io if needed -if ! docker pull docker.0k.io/gogocarto-builder:${docker_tree_hash}; then - make docker-build && - docker tag gogocarto_gogocarto:latest docker.0k.io/gogocarto-builder:${docker_tree_hash} && - docker push docker.0k.io/gogocarto-builder:${docker_tree_hash} -else - docker tag docker.0k.io/gogocarto-builder:${docker_tree_hash} gogocarto_gogocarto:latest -fi -make up && -docker-compose exec gogocarto make init + docker_tree_hash=$(git rev-parse HEAD:docker) + ## Intermediate docker image is cached on docker.0k.io if needed + if ! docker pull docker.0k.io/gogocarto-builder:${docker_tree_hash}; then + make docker-build && + docker tag gogocarto_gogocarto:latest docker.0k.io/gogocarto-builder:${docker_tree_hash} && + docker push docker.0k.io/gogocarto-builder:${docker_tree_hash} || { + echo "You don't seem to be able to push something on docker.0k.io, that's ok." + } + else + docker tag docker.0k.io/gogocarto-builder:${docker_tree_hash} gogocarto_gogocarto:latest + fi + make up && + docker-compose exec gogocarto make init #+end_src Last =make init= is building the actual code to be served. @@ -45,12 +48,13 @@ This is the content of the source tree, once populated by =make init=. *** mongodb initialisation is not included in source and is handled by the charm -As of <2020-10-23 Fri>, the =Makefile='s =init= target is: +As of <2022-12-03 Sat>, the =Makefile='s =init= target is: -#+begin_src sh +#+begin_quote $ grep ^init Makefile -A1 -init: install assets load-fixtures fix-perms ## Initialize the project -#+end_src +init: install assets load-fixtures fix-perms ## Initialize the project + +#+end_quote Note that =load-fixtures= target is actually the mongodb initialization: @@ -62,10 +66,10 @@ load-fixtures: ## Create the DB schema, generate DB classes and load fixtures $(SYMFONY) doctrine:mongodb:fixtures:load -n #+end_src -This will be done in the =hooks/mongo_database-relation-joined= accordingly. +This is be done in the =hooks/mongo_database-relation-joined= accordingly. -*** create the full data release bundle this is what was made +*** create the full release bundle #+begin_src sh ## Force original versions