X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=csit.infra.dash%2Fdocker-compose.yaml;h=4ec4f21eb6029bf186a3c4e8b2d3e41431eed29e;hb=abbc3a9aac22427a50c45adddf4307bab6d8a3ef;hp=e2259b82bad1342ba98fef0f420ed83228c322a1;hpb=6034d72d01c76060e0f0804fd80e6b1308886cd3;p=csit.git

diff --git a/csit.infra.dash/docker-compose.yaml b/csit.infra.dash/docker-compose.yaml
index e2259b82ba..4ec4f21eb6 100644
--- a/csit.infra.dash/docker-compose.yaml
+++ b/csit.infra.dash/docker-compose.yaml
@@ -1,35 +1,52 @@
 version: "3.7"
 services:
-  dash:
+  cdash:
     build: "."
     command: "uwsgi --ini app.ini --workers 1"
     depends_on:
       - "minio"
+      - "mc"
     environment:
-      AWS_ACCESS_KEY_ID: ""
-      AWS_SECRET_ACCESS_KEY: ""
-    ports:
-      - "5000"
+      FLASK_DEBUG: 1
+      FLASK_ENV: "development"
     mem_limit: "4g"
+    ports:
+      - "5000:5000"
+    user: "${UID}:${GID}"
     volumes:
       - "${PWD}/app/:/app"
       - "${PWD}/../resources/libraries/python/jumpavg/:/app/cdash/jumpavg"
       - "${HOME}/.aws:/.aws"
   minio:
-    image: "quay.io/minio/minio:RELEASE.2022-11-08T05-27-07Z"
+    image: "quay.io/minio/minio:latest"
     command: server --console-address ":9001" /data
-    expose:
-      - "9000"
-      - "9001"
     environment:
       MINIO_ROOT_USER: "minioadmin"
       MINIO_ROOT_PASSWORD: "minioadmin"
+    expose:
+      - "9000"
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
+      test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
       interval: "30s"
       timeout: "20s"
       retries: 3
+    ports:
+      - "9001:9001"
     volumes:
       - "data:/data"
+  mc:
+    image: "quay.io/minio/mc:latest"
+    depends_on:
+      - "minio"
+    entrypoint: >
+      /bin/sh -c "
+      /usr/bin/mc config host rm local;
+      /usr/bin/mc config host add --quiet --api s3v4 local http://minio:9000 minioadmin minioadmin;
+      /usr/bin/mc mb --quiet --ignore-existing local/fdio-docs-s3-cloudfront-index/;
+      /usr/bin/mc anonymous set public local/fdio-docs-s3-cloudfront-index;
+      "
+    # mc alias set aws https://s3.amazon.com/endpoint ACCESS_KEY SECRET KEY
+    # mc admin info aws
 volumes:
-  data:
\ No newline at end of file
+  data:
+#    external: true