Merge pull request #257 from datajoint/stage-external-storage

Update reverse proxy and string test

Author: eywalker

LNX-docker-compose.yml

@@ -29,13 +29,17 @@ services:
       interval: 1s
   fakeservices.datajoint.io:
     <<: *net
-    image: raphaelguzman/nginx:v0.0.4
+    image: raphaelguzman/nginx:v0.0.8
     environment:
     - ADD_db_TYPE=DATABASE
     - ADD_db_ENDPOINT=db:3306
     - ADD_minio_TYPE=MINIO
     - ADD_minio_ENDPOINT=minio:9000
-    - ADD_minio_PREFIX=/
+    - ADD_minio_PORT=80 # allow unencrypted connections
+    - ADD_minio_PREFIX=/datajoint
+    - ADD_browser_TYPE=MINIOADMIN
+    - ADD_browser_ENDPOINT=minio:9000
+    - ADD_browser_PORT=80 # allow unencrypted connections
     depends_on:
       db:
         condition: service_healthy
@@ -53,10 +57,10 @@ services:
     - DJ_TEST_HOST=fakeservices.datajoint.io
     - DJ_TEST_USER=datajoint
     - DJ_TEST_PASSWORD=datajoint
-    - S3_ENDPOINT=fakeservices.datajoint.io:9000
+    - S3_ENDPOINT=fakeservices.datajoint.io
     - S3_ACCESS_KEY=datajoint
     - S3_SECRET_KEY=datajoint
-    - S3_BUCKET=datajoint-test
+    - S3_BUCKET=datajoint.test
     image: raphaelguzman/matlab:${MATLAB_VERSION}-MIN
     depends_on:
       fakeservices.datajoint.io:

local-docker-compose.yml

@@ -34,17 +34,21 @@ services:
       interval: 1s
   fakeservices.datajoint.io:
     <<: *net
-    image: raphaelguzman/nginx:v0.0.4
+    image: raphaelguzman/nginx:v0.0.8
     environment:
     - ADD_db_TYPE=DATABASE
     - ADD_db_ENDPOINT=db:3306
     - ADD_minio_TYPE=MINIO
     - ADD_minio_ENDPOINT=minio:9000
-    - ADD_minio_PREFIX=/
+    - ADD_minio_PORT=80 # allow unencrypted connections
+    - ADD_minio_PREFIX=/datajoint
+    - ADD_browser_TYPE=MINIOADMIN
+    - ADD_browser_ENDPOINT=minio:9000
+    - ADD_browser_PORT=80 # allow unencrypted connections
     ports:
+      - "80:80"
       - "443:443"
       - "3306:3306"
-      - "9000:9000"
     depends_on:
       db:
         condition: service_healthy
@@ -59,10 +63,10 @@ services:
     - DJ_TEST_HOST=fakeservices.datajoint.io
     - DJ_TEST_USER=datajoint
     - DJ_TEST_PASSWORD=datajoint
-    - S3_ENDPOINT=fakeservices.datajoint.io:9000
+    - S3_ENDPOINT=fakeservices.datajoint.io
     - S3_ACCESS_KEY=datajoint
     - S3_SECRET_KEY=datajoint
-    - S3_BUCKET=datajoint-test
+    - S3_BUCKET=datajoint.test
     - MATLAB_USER
     - MATLAB_LICENSE
     - JUPYTER_PASSWORD=datajoint

tests/TestFetch.m

@@ -155,7 +155,7 @@ function TestFetch_testVariousDatatypes(testCase)
 
             insert(University.All, struct( ...
                 'id', 2, ...
-                'string', 'test', ...
+                'string', 'lteachen', ...
                 'date', '2019-12-17 13:38', ...
                 'number', 3.213, ...
                 'blob', [1, 2; 3, 4] ...
@@ -165,7 +165,7 @@ function TestFetch_testVariousDatatypes(testCase)
             res = q.fetch('*');
 
             testCase.verifyEqual(res(1).id,  2);
-            testCase.verifyEqual(res(1).string,  'test');
+            testCase.verifyEqual(res(1).string,  'lteachen');
             testCase.verifyEqual(res(1).date,  '2019-12-17 13:38:00');
             testCase.verifyEqual(res(1).number,  3.213);
             testCase.verifyEqual(res(1).blob,  [1, 2; 3, 4]);