Commit d39e1332 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/gitlab-ci-templates!14
parents 35ddf858 7c180b00

deployment.yml

+3 −0
Original line number Diff line number Diff line 
variables:

  DEPLOYMENT_IMAGE: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}

  STACK: stack

  REGISTRY_URL: ${CI_REGISTRY}

  REGISTRY_USER: ${CI_DEPLOY_USER}

  REGISTRY_PASS: ${CI_DEPLOY_PASSWORD}

  STATUS_CHECK_RETRIES: 10

  STATUS_CHECK_INTERVAL: 20

  STATUS_CHECK_DELAY: 120

packaging.yml

+18 −7
Original line number Diff line number Diff line 
variables:

  PACKAGING_IMAGE: docker:stable

  DIND_IMAGE: docker:dind

  DOCKER_REGISTRY: ${CI_REGISTRY}

  DOCKER_REGISTRY_USER: gitlab-ci-token

  DOCKER_REGISTRY_PASS: ${CI_JOB_TOKEN}

  DOCKER_CACHE_ARGS: '--cache-from ${CI_REGISTRY_IMAGE}:latest'

  GITLAB_REGISTRY_USER: gitlab-ci-token

  GITLAB_REGISTRY_PASS: ${CI_JOB_TOKEN}

  DOCKER_HUB_ROOT: redmic

  DOCKER_BUILD_ARGS: ''



.docker:
@@ -15,7 +14,7 @@ variables: 
  services:

    - ${DIND_IMAGE}

  before_script:

    - docker login -u ${DOCKER_REGISTRY_USER} -p ${DOCKER_REGISTRY_PASS} ${DOCKER_REGISTRY}

    - docker login -u ${GITLAB_REGISTRY_USER} -p ${GITLAB_REGISTRY_PASS} ${CI_REGISTRY}



.docker-operations:

  stage: package
@@ -28,7 +27,7 @@ variables: 
  script:

    - docker pull ${CI_REGISTRY_IMAGE}:latest || true

    - >

      docker build ${DOCKER_CACHE_ARGS} ${DOCKER_BUILD_ARGS}

      docker build --cache-from ${CI_REGISTRY_IMAGE}:latest ${DOCKER_BUILD_ARGS}

      -t ${DOCKER_DEFAULT_TAGGING}

      -t ${DOCKER_SPECIFIC_TAGGING} .
@@ -51,7 +50,7 @@ docker-build-stable-branch: 
  except:

    - schedules



docker-tag:

docker-tag-gitlab-registry:

  extends: .docker-operations

  only:

    - tags
@@ -59,6 +58,18 @@ docker-tag: 
    - docker pull ${DOCKER_DEFAULT_TAGGING}

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



docker-tag-docker-hub:

  extends: .docker-operations

  only:

    - tags

  script:

    - docker pull ${DOCKER_DEFAULT_TAGGING}

    - docker login -u ${DOCKER_HUB_USER} -p ${DOCKER_HUB_PASS}

    - dockerHubImagePath="$(echo ${CI_PROJECT_PATH} | cut -d '/' -f 2-)"

    - dockerHubImage="${DOCKER_HUB_ROOT}/${dockerHubImagePath}"

    - docker tag ${DOCKER_DEFAULT_TAGGING} ${dockerHubImage}:${CI_COMMIT_TAG}

    - docker tag ${DOCKER_DEFAULT_TAGGING} ${dockerHubImage}:latest



docker-scan:

  stage: test-package

  extends: .docker