Commit 9429c33e authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza proyecto y emplea imagen de terceros 

Usa imagen Docker de terceros que ya integra la funcionalidad
(construida desde el proyecto origen de este proyecto), en lugar de
mantener el script como sobrescritura del comando a ejecutar.

Renueva plantillas ci y configuración compose.

Añade variables y actualiza valores por defecto.
parent 30bc1879

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'

    file: '/deployment-service/docker-deploy.yml'



stages:

  - deploy

deploy/.env

+7 −3
Original line number Diff line number Diff line 
NFS_ROOT_PATH=/nfs



VOL_TYPE=nfs4

VOL_DRIVER=local

VOL_TYPE=nfs

VOL_ADDR=127.0.0.1

VOL_OPTS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14

NFS_VOL_DEVICE=:/
 
VOL_VERS=4.2

VOL_OPTS=nolock,noacl,noatime,nodiratime



NFS_VOL_NAME=nfs-startup-vol

NFS_VOL_DEVICE=/

deploy/docker-compose.tmpl.yml→deploy/compose.yaml

+40 −0
Original line number Diff line number Diff line 
version: '3.9'



services:

  nfs-startup:

    image: ${IMAGE_NAME:-alpine}:${IMAGE_TAG:-latest}

    entrypoint: sh -c

    command:

      - >

        echo "NFS startup";

        echo "Populating \"$${VOL_ADDR}$${NFS_VOL_DEVICE}\" (mounted at: \"$${NFS_ROOT_PATH}\")";

        for directoryDefinition in $${NFS_STARTUP_DIRS};

        do

          directoryName=$$(echo "$${directoryDefinition}" | cut -d ':' -f 1);

          directoryUid=$$(echo "$${directoryDefinition}:" | cut -d ':' -f 2);

          directoryGid=$$(echo "$${directoryDefinition}:" | cut -d ':' -f 3);

          directoryPath=$${NFS_ROOT_PATH}/$${directoryName};

          echo "Creating \"$${directoryName}\" ..";

          if [ -d $${directoryPath} ];

          then

            echo "  already exists!";

            directoryExists=1;

          fi;

          mkdir -p $${directoryPath};

          if [ -d $${directoryPath} ];

          then

            if [ -z $${directoryExists} ];

            then

              echo "  successfully created!";

            fi;

          else

            echo "  creation failed!";

          fi;

          if [ ! -z $${directoryUid} ];

          then

            echo "  set UID to \"$${directoryUid}\"";

            chown $${directoryUid} $${directoryPath};

          fi;

          if [ ! -z $${directoryGid} ];

          then

            echo "  set GID to \"$${directoryGid}\"";

            chgrp $${directoryGid} $${directoryPath};

          fi;

        done;

        echo "Done!"

    image: ${IMAGE_NAME:-pedroetb/nfs-startup}:${IMAGE_TAG:-latest}

    environment:

      NFS_ROOT_PATH:

      NFS_STARTUP_DIRS:
@@ -73,9 +32,9 @@ networks: 


volumes:

  nfs-vol:

    name: ${NFS_VOL_NAME:-nfs-startup-vol}

    driver: local

    name: ${NFS_VOL_NAME}

    driver: ${VOL_DRIVER}

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${NFS_VOL_DEVICE}
 
      o: addr=${VOL_ADDR},vers=${VOL_VERS},${VOL_OPTS}

      device: :${VOL_DEVICE_PREFIX}${NFS_VOL_DEVICE}

deploy/docker-compose.dev.yml

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
version: '3.9'

deploy/docker-compose.prod.yml

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
version: '3.9'