Update doc install for docker/docker compose and update makefile to use new way of callign docker compose
This commit is contained in:
8
Makefile
8
Makefile
@@ -23,18 +23,18 @@ help: ## Prints this help
|
||||
|
||||
clean: ## Nettoie et éteint le projet
|
||||
@rm -rf public/*
|
||||
@docker-compose down # stop + rm
|
||||
@docker compose down # stop + rm
|
||||
|
||||
docker.up: ## Démarre simplement la stack
|
||||
@docker-compose up -d # create + start en daemon
|
||||
@docker compose up -d # create + start en daemon
|
||||
|
||||
docker.pull: ## Récupère la dernière image
|
||||
-@docker-compose pull
|
||||
-@docker compose pull
|
||||
|
||||
dev: clean docker.pull docker.up ## Démarre la génération de document en mode développement
|
||||
|
||||
TARGET_DIR=${COMMAND_ARGS}
|
||||
export TARGET_DIR
|
||||
generate.pdf: ## Génère le pdf du document donné (make generate.pdf TARGET_DIR=ri)
|
||||
@docker-compose run --rm -e SPI_FORMAT=pdf -e SPI_WATCH=false -e "MULTIPLE_TARGET=${TARGET_DIR}" pandoc
|
||||
@docker compose run --rm -e SPI_FORMAT=pdf -e SPI_WATCH=false -e "MULTIPLE_TARGET=${TARGET_DIR}" pandoc
|
||||
|
||||
|
||||
13
README.md
13
README.md
@@ -43,10 +43,15 @@ Il faut avoir, au préalable installé docker-compose (version 2.6.0 minimum)
|
||||
|
||||
|
||||
```shell
|
||||
# installation de docker-compose
|
||||
sudo curl -L "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
|
||||
sudo chmod +x /usr/local/bin/docker-compose
|
||||
sudo ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose
|
||||
# installation de docker et docker-compose
|
||||
https://docs.docker.com/engine/install/debian/#install-using-the-repository
|
||||
https://docs.docker.com/compose/install/
|
||||
|
||||
apt install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
|
||||
sudo apt-get install gnome-shell-extension-appindicator
|
||||
|
||||
#TODO => attention, la partie pour rendre docker utilisable en non-root n'est pas documenté
|
||||
|
||||
```
|
||||
|
||||
### Démarrage et arrêt de l'environement d'édition
|
||||
|
||||
Reference in New Issue
Block a user