Remove packages from the image that are not usually used

.drone.yml

@@ -3,8 +3,6 @@ type: docker
 name: build
 
 trigger:
-  branch:
-    - build
   event:
     - push
 
@@ -19,11 +17,13 @@ steps:
 
   - name: docker-build
     image: plugins/docker
+    depends_on:
+      - key-setup
     settings:
        dockerfile: Dockerfile
        context: .
        registry: hub.codefirst.iut.uca.fr
-       repo: hub.codefirst.iut.uca.fr/alexandre.agostinho/codefirst-docdeployer
+       repo: hub.codefirst.iut.uca.fr/maxime.batista/codefirst-docdeployer
        username:
          from_secret: SECRET_REGISTRY_USERNAME
        password:

Dockerfile

@@ -1,12 +1,12 @@
 FROM debian:bookworm
 LABEL author="Maxime Batista"
 
-RUN apt update && apt -y install sshpass rsync doxygen nodejs npm xdot xdotool wget
+RUN apt-get update && apt-get -y install ssh rsync doxygen wget \
+    && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /usr/local
-RUN npm install docusaurus
 
-RUN wget -qO- 'https://github.com/rust-lang/mdBook/releases/download/v0.4.25/mdbook-v0.4.25-x86_64-unknown-linux-gnu.tar.gz' | tar xvz -C /usr/local/bin
+RUN wget -qO- 'https://github.com/rust-lang/mdBook/releases/download/v0.4.28/mdbook-v0.4.28-x86_64-unknown-linux-gnu.tar.gz' | tar xvz -C /usr/local/bin
 
 RUN mkdir -p /root/.ssh
 COPY ./id_rsa /root/.ssh/

README.md

@@ -1,26 +1,16 @@
 # Docdeployer
 
-A Drone CI tool to easily deploy documentation on CodeDoc
+Usage:
-
-## Note
-This repo is forked from <https://codefirst.iut.uca.fr/git/maxime.batista/codefirst-docdeployer>.
-
-I only made a few small changes to this repository to adapt it to my way of working.
-
-## Usage:
 ```yml
 steps:
-  - name: generate-and-deploy-docs
+  - name: swagger-doc
-    image: hub.codefirst.iut.uca.fr/alexandre.agostinho/codefirst-docdeployer:latest
+    image: hub.codefirst.iut.uca.fr/maxime.batista/codefirst-docdeployer
-    failure: ignore
-    volumes:
-      - name: docs
-        path: /docs
     commands:
       - /entrypoint.sh <arguments>
 ```
 
-`entrypoint.sh`  
+## `entrypoint.sh`
+
 This command generates the documentation and deploys it on your CodeDoc space
 
 ### Arguments
@@ -30,15 +20,25 @@ This command generates the documentation and deploys it on your CodeDoc space
 - `-t --type [docusaurus|doxygen|mdbook|swagger]` type of documentation generator to use. - **required**
 - `-d --dest [dir]` path to where to put the documentation outputs in your repository's CodeDoc space - **optional <u>!! cannot be absolute !!</u>**
 
-### Examples :
+Note !  
+For swagger and doxygen, you have to pass the configuration file instead of a directory
+
+Usage examples :
 
 ```
 /entrypoint.sh -l ./documentation/api/api-swagger.yml -t swagger -d api_documentation
 /entrypoint.sh -l ./documentation/app -t docusaurus -d application_documentation
-/entrypoint.sh -b main -l ./documentation/doxygen/ -t doxygen -d sourcecode_documentation
+/entrypoint.sh -b main -l ./src/Doxyfile -t doxygen -d sourcecode_documentation
 /entrypoint.sh -l ./doc -t mdbook -d book
 ```
 
----
+### How to add a custom documentation generator ?
+
+The `-t <g>` (`--type <g>`) option lookups for a generator script `<g>`.sh to be present in the `/generators`  
+(ex: `--type doxygen` searchs for a `/generators/doxygen.sh` file script).  
+You can add your own generator by simply moving your script into the `/generators` folder
 
-For more informations, check the [original repository](https://codefirst.iut.uca.fr/git/maxime.batista/codefirst-docdeployer).
+Furthermore, your generator MUST follow below specifications :   
+* Define a `generate()` function that will be called, assuming that `$1` equals to the value passed after `-l` (`--loc`) which is the documentation sources location
+* Define a `GEN_PATH` variable which is the path of generated outputs
+* Place generated outputs in the `GEN_PATH` folder, the caller will then upload generated sources onto the user's CodeDoc space

entrypoint.sh

@@ -56,14 +56,14 @@ fi
 
 RELATIVE_PATH=$(echo "$DRONE_REPO_OWNER/$DRONE_REPO_NAME/$DEST/" | tr -s "/")
 
+. "$GENERATOR_SCRIPT"
+generate "$DOC_DIR" # generates doc using the wanted generator
+
 if [[ -n $BRANCH && ! $DRONE_BRANCH =~ $BRANCH ]]; then
   echo "ignoring deploy step since current branch doesn't match $BRANCH"
   exit
 fi
 
-. "$GENERATOR_SCRIPT"
-generate "$DOC_DIR" # generates doc using the wanted generator
-
 SERVER_TARGET="/usr/share/nginx/html/$RELATIVE_PATH"
 
 # launches rsync in archive, verbose and compression mode

generators/doxygen.sh

@@ -7,7 +7,9 @@ generate() {
     exit 1
   fi
 
+  doxygen -u
+  doxygen "$1"
+
   mkdir -p $GEN_PATH
-  cd "$1"
+  mv html/* $GEN_PATH
-  (cat Doxyfile; echo -e "\nOUTPUT_DIRECTORY = \nHTML_OUTPUT = $GEN_PATH") | doxygen -
 }