PROCESS: Databases settings are pushed along with backend code.

Hypertopic · Dec 26, 2024 · a208cc8 · a208cc8
1 parent 1afc3a6
commit a208cc8
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 653 deletions.
diff --git a/backend/LICENSE → LICENSE b/backend/LICENSE → LICENSE
diff --git a/backend/_config.json b/backend/_config.json
@@ -0,0 +1 @@
+{"couchdb":{"users_db_security_editable": "true"}}
diff --git a/backend/_users/_security.json b/backend/_users/_security.json
@@ -0,0 +1 @@
+{"members":{"roles":[]},"admins":{"roles":["_admin"]}}
diff --git a/backend/hyperglosae/_security.json b/backend/hyperglosae/_security.json
@@ -0,0 +1 @@
+{"members":{"roles":[]},"admins":{"roles":["_admin"]}}
diff --git a/backend/src/_id → backend/hyperglosae/src/_id b/backend/src/_id → backend/hyperglosae/src/_id
diff --git a/backend/src/validate_doc_update.js → ...nd/hyperglosae/src/validate_doc_update.js b/backend/src/validate_doc_update.js → ...nd/hyperglosae/src/validate_doc_update.js
diff --git a/backend/src/views/all_documents/map.js → ...yperglosae/src/views/all_documents/map.js b/backend/src/views/all_documents/map.js → ...yperglosae/src/views/all_documents/map.js
diff --git a/backend/src/views/bookmark/map.js → ...end/hyperglosae/src/views/bookmark/map.js b/backend/src/views/bookmark/map.js → ...end/hyperglosae/src/views/bookmark/map.js
diff --git a/backend/src/views/content/map.js → backend/hyperglosae/src/views/content/map.js b/backend/src/views/content/map.js → backend/hyperglosae/src/views/content/map.js
diff --git a/backend/src/views/lib/links.js → backend/hyperglosae/src/views/lib/links.js b/backend/src/views/lib/links.js → backend/hyperglosae/src/views/lib/links.js
diff --git a/backend/src/views/metadata/map.js → ...end/hyperglosae/src/views/metadata/map.js b/backend/src/views/metadata/map.js → ...end/hyperglosae/src/views/metadata/map.js
diff --git a/backend/src/views/types/map.js → backend/hyperglosae/src/views/types/map.js b/backend/src/views/types/map.js → backend/hyperglosae/src/views/types/map.js
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -12,21 +12,6 @@ services:
       start_period: 5s
       start_interval: 2s
 
-  accessible_backend:
-    image: curlimages/curl
-    entrypoint: ["/bin/sh","-c"]
-    command:
-      - |
-        alias put="curl -X PUT -u '${COUCHDB_USER}:${COUCHDB_PASSWORD}'"
-        put backend:5984/hyperglosae
-        put backend:5984/hyperglosae/_security --data '{"members":{"roles":[]},"admins":{"roles":["_admin"]}}'
-        put backend:5984/_node/nonode@nohost/_config/couchdb/users_db_security_editable --data '"true"'
-        put backend:5984/_users
-        put backend:5984/_users/_security --data '{"members":{"roles":[]},"admins":{"roles":["_admin"]}}'
-    depends_on:
-      backend:
-        condition: service_healthy
-
   updated_samples:
     image: node:22-slim
     command: npx couchdb-bootstrap http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@backend:5984 samples
@@ -38,9 +23,9 @@ services:
 
   updated_code:
     image: node:22-slim
-    command: npx couchdb-push http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@backend:5984/hyperglosae app
+    command: npx couchdb-bootstrap http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@backend:5984 app
     volumes:
-      - ./backend/src:/app
+      - ./backend:/app
     depends_on:
       backend:
         condition: service_healthy

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -5,14 +5,6 @@ services:
       file: docker-compose.dev.yml
       service: backend
 
-  accessible_backend:
-    extends:
-      file: docker-compose.dev.yml
-      service: accessible_backend
-    depends_on:
-      backend:
-        condition: service_healthy
-
   updated_samples:
     extends:
       file: docker-compose.dev.yml
@@ -39,7 +31,7 @@ services:
       start_period: 5s
       start_interval: 2s
     depends_on:
-      accessible_backend:
+      updated_code:
         condition: service_completed_successfully
 
   proxy:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,14 +7,6 @@ services:
     volumes:
       - ./data:/opt/couchdb/data
 
-  accessible_backend:
-    extends:
-      file: docker-compose.test.yml
-      service: accessible_backend
-    depends_on:
-      backend:
-        condition: service_healthy
-
   updated_code:
     extends:
       file: docker-compose.test.yml

diff --git a/frontend/LICENSE b/frontend/LICENSE
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"couchdb":{"users_db_security_editable": "true"}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"members":{"roles":[]},"admins":{"roles":["_admin"]}}