- ansible docker images

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

dockerfiles/services/jenkins/docker-compose.yml

@@ -17,6 +17,8 @@ services:
     ports:
       - "8080:8080"
       - "50000:50000"
+    environment:
+      - "JAVA_OPTS=-Dhudson.model.DirectoryBrowserSupport.CSP="
     deploy:
       mode: replicated
       replicas: 1

dockerfiles/services/jenkins/startHostProxy.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+DOCKER_HOST=dkhost:2376 docker run -d --rm --name 'dockerhost' --cap-add=NET_ADMIN --cap-add=NET_RAW qoomon/docker-host

dockerfiles/services/launch_apps.sh

@@ -10,6 +10,8 @@ docker stack deploy --with-registry-auth --prune -c nextcloud/docker-compose-pro
 
 docker stack deploy --with-registry-auth --prune -c ui/docker-compose.yml dkui
 
+docker stack deploy --with-registry-auth --prune -c jenkins/docker-compose.yml jenkins
+
 #docker stack deploy --with-registry-auth --prune -c letsencrypt/docker-compose-update.yml letsencrypt
 
 docker stack deploy --with-registry-auth --prune -c prometheus/docker-compose-prod.yml metrics

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