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

Elimina artifactory y minio

parent 2c6dad1f
Loading
Loading
Loading
Loading
+0 −39
Original line number Diff line number Diff line
@@ -10,25 +10,6 @@ variables:
  DOCKER_DRIVER: overlay2
  STATUS_CHECK_DELAY: 60

deploy-artifactory-dev:
  stage: deploy
  variables:
    DEPLOY_DIR_NAME: artifactory
    SSH_REMOTE: ${DEV_SSH_REMOTE}
    STACK: artifactory
    SERVICES_TO_CHECK: artifactory_artifactory
    IMAGE_TAG: latest
    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
  script:
    - >
      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${DEV_PUBLIC_HOSTNAME}
  environment:
    name: dev/artifactory
    url: https://artifactory.${DEV_PUBLIC_HOSTNAME}
  only:
    - dev
  when: manual

deploy-gitlab-ce-dev:
  stage: deploy
  variables:
@@ -156,23 +137,3 @@ deploy-mail-client-dev:
  only:
    - dev
  when: manual

deploy-minio-dev:
  stage: deploy
  variables:
    DEPLOY_DIR_NAME: minio
    SSH_REMOTE: ${DEV_SSH_REMOTE}
    STACK: minio
    SERVICES_TO_CHECK: minio_minio
    IMAGE_TAG: latest
    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
  script:
    - >
      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY}
      MINIO_SECRET_KEY=${MINIO_SECRET_KEY} PUBLIC_HOSTNAME=${DEV_PUBLIC_HOSTNAME}
  environment:
    name: dev/minio
    url: https://minio.${DEV_PUBLIC_HOSTNAME}
  only:
    - dev
  when: manual
+1 −3
Original line number Diff line number Diff line
@@ -2,13 +2,11 @@

## Services

* Artifactory
* GitLab-CE
* GitLab Runner
* Mail admin
* Mail client
* Mail server
* Minio

### Problemas

artifactory/.env

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line
ARTIFACTORY_PORT=7080
+0 −29
Original line number Diff line number Diff line
version: '3.5'

services:
  artifactory:
    ports:
      - target: 8081
        published: ${ARTIFACTORY_PORT}
        mode: host
    deploy:
      mode: replicated
      replicas: 1
      labels:
        traefik.port: "8081"
        traefik.docker.network: traefik-net
        traefik.frontend.rule: Host:artifactory.${PUBLIC_HOSTNAME}
        traefik.backend: artifactory
      restart_policy:
        delay: 30s
        window: 2m
      resources:
        limits:
          cpus: '0.5'
          memory: 2560M
        reservations:
          memory: 2048M

volumes:
  artifactory-vol:
    name: artifactory-vol
+0 −16
Original line number Diff line number Diff line
version: '3.5'

services:
  artifactory:
    image: docker.bintray.io/jfrog/artifactory-oss:${IMAGE_TAG:-latest}
    networks:
      - redmic-net
      - traefik-net
    volumes:
      - artifactory-vol:/var/opt/jfrog/artifactory

networks:
  redmic-net:
    external: true
  traefik-net:
    external: true
Loading