Commit 3704284a authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza flujo de CI y propiedades de pro

parent 940dc2c7

.gitlab-ci.yml

+39 −19
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ stages: 


maven-build:

  stage: build

  image: redmic/maven-gitlab

  image: registry.gitlab.com/redmic-project/docker/maven

  variables:

    MAVEN_OPTS: -Dmaven.repo.local=.m2/repository

    SPRING_PROFILES_ACTIVE: test
@@ -20,8 +20,6 @@ maven-build: 
    ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}

  only:

    - branches

  except:

    - master

  cache:

    paths:

      - .m2/repository/
@@ -32,16 +30,18 @@ maven-build: 
  after_script:

    - rm -r .m2/repository/es

  artifacts:

    name: "${CI_PROJECT_NAME}"

    name: "${CI_PROJECT_NAME}-${CI_COMMIT_REF_NAME}"

    expire_in: '6 months'

    paths:

      - dist/*.jar



docker-build-commit:

docker-build-commit-non-master-branches:

  stage: package

  image: redmic/docker-gitlab

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

    PARENT_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/redmic-server

    PARENT_IMAGE_TAG: latest

  services:

    - docker:dind

  only:
@@ -50,12 +50,32 @@ docker-build-commit: 
    - master

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .

    - >

      docker build --build-arg PARENT_IMAGE_NAME=${PARENT_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${PARENT_IMAGE_TAG}

      -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-build-commit-master-branch:

  stage: package

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

    PARENT_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/redmic-server

    PARENT_IMAGE_TAG: latest

  services:

    - docker:dind

  only:

    - master

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - >

      docker build --build-arg PARENT_IMAGE_NAME=${PARENT_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${PARENT_IMAGE_TAG}

      -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-build-tag:

docker-tag-already-built-image:

  stage: package

  image: redmic/docker-gitlab

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

  services:
@@ -64,10 +84,10 @@ docker-build-tag: 
    - tags

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG} -t ${CI_REGISTRY_IMAGE}:latest .

    - docker tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}

    - docker push ${CI_REGISTRY_IMAGE}



container_scanning:

container-scanning:

  stage: test-package

  image: docker:stable

  variables:
@@ -77,8 +97,6 @@ container_scanning: 
    - docker:stable-dind

  only:

    - branches

  except:

    - master

  script:

    - docker run -d --name db arminc/clair-db:latest

    - docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1
@@ -89,13 +107,15 @@ container_scanning: 
    - mv clair-scanner_linux_amd64 clair-scanner

    - chmod +x clair-scanner

    - touch clair-whitelist.yml

    - ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log -w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} || true

    - >

      ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log

      -w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} || true

  artifacts:

    paths: [gl-sast-container-report.json]



deploy-dev:

  stage: deploy

  image: redmic/docker-gitlab

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}
@@ -120,7 +140,7 @@ deploy-dev: 


deploy-supporting-branch:

  stage: deploy

  image: redmic/docker-gitlab

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}
@@ -149,13 +169,13 @@ deploy-supporting-branch: 


deploy-pro:

  stage: deploy

  image: redmic/docker-gitlab

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_TAG}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

  services:

    - docker:dind
@@ -170,5 +190,5 @@ deploy-pro: 
    name: pro

    url: https://${PRO_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}

  only:

    - tags

    - master

  when: manual

Dockerfile

+4 −1
Original line number Diff line number Diff line 
FROM redmic/redmic-server

ARG PARENT_IMAGE_NAME

ARG PARENT_IMAGE_TAG



FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}



COPY /dist/*.jar ./

src/main/resources/application-prod.properties

+5 −5
Original line number Diff line number Diff line 
server.port=8080

#elastic

elastic.addresses=127.0.0.1,172.31.8.153

elastic.addresses=es-1,es-2,es-3

elastic.port=9300

elastic.clusterName=redmic

redmic.elasticsearch.check.mappings=true
@@ -11,13 +11,13 @@ aws.region=eu-west-1 


# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)

spring.datasource.name=redmic

spring.datasource.url=jdbc:postgresql://localhost:5432/redmic?stringtype=unspecified

spring.datasource.url=jdbc:postgresql://db:5432/redmic?stringtype=unspecified



#oauth

oauth.server=http://oauth:8081



#Sitemap properties

property.USER_API=http://127.0.0.1:8082

property.USER_API=http://user:8082

property.SITEMAP_BASE_URL=https://redmic.es



#S3
@@ -27,8 +27,8 @@ property.path.media_storage.PUBLIC_BASE_PATH=/public 


#Local private



property.path.media_storage.LOCAL_PRIVATE_BASE_PATH=/data/REDMIC/MEDIA_STORAGE

property.path.media_storage.LOCAL_PRIVATE_BASE_PATH=/data/MEDIA_STORAGE



#Local public



property.path.media_storage.LOCAL_PUBLIC_BASE_PATH=/data/REDMIC/PUBLIC_MEDIA_STORAGE
 
 No newline at end of file
 
property.path.media_storage.LOCAL_PUBLIC_BASE_PATH=/data/PUBLIC_MEDIA_STORAGE
 
 No newline at end of file