- ansible docker images

- ansible play for cleaning hosts (apt autoremove)
- mondrian(incomplete)
- lock postgres to version 10
- update jenkins dockerfile

dockerfiles/services/services/dkregistry/docker-compose.yml

@@ -51,3 +51,30 @@ services:
         fluentd-address: "logs.xai-corp.net:24224"
         fluentd-async-connect: 'true'
         tag: dkregistry
+
+#  registry-ui:
+#    image: hyper/docker-registry-web
+#    ports:
+#    - 8087:8080
+#    environment:
+#      REGISTRY_URL: https://dkregistry.xai-corp.net:5000/v2
+#      REGISTRY_NAME: dkregistry
+#      REGISTRY_READONLY: 'false'
+#      REGISTRY_AUTH_ENABLED: 'true'
+#      REGISTRY_BASIC_AUTH: $apr1$2vrW.sPv$aIZ6xnQcvde6.kX7KvWm5/
+#
+#    deploy:
+#      mode: replicated
+#      replicas: 1
+#      restart_policy:
+#        condition: any
+#        delay: "1s"
+#        max_attempts: 1
+#      update_config:
+#        parallelism: 1
+#        delay: 2s
+#        order: start-first
+#      resources:
+#        limits:
+#          cpus: '2'
+#          memory: 2048M

dockerfiles/services/services/launch_services.sh

@@ -15,16 +15,17 @@ docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY
 docker-compose \
     -f network.yml \
     -f postgres/docker-compose.yml \
-    -f dkregistry/docker-compose.yml \
     -f mariadb/docker-compose.yml \
     -f fluentd/docker-compose-prod.yml \
     -f memcached/docker-compose.yml \
     -f redis/docker-compose.yml \
     -f datadog/docker-compose.yml \
+    -f dkregistry/docker-compose.yml \
     -f cron/docker-compose.yml \
     config > $CONFIG
 
 
+
 docker stack deploy  --prune --with-registry-auth -c $CONFIG $SERVICE
 
 # Cleanup

dockerfiles/services/services/postgres/docker-compose.yml

@@ -6,7 +6,7 @@ services:
   postgres:
     volumes:
       - /opt/shared/postgres/data:/data
-    image: postgres:alpine
+    image: postgres:10-alpine
     environment:
       POSTGRES_PASSWORD: snqioxni1sw
       POSTGRES_USER: xaicorp_admin