From be0425f847d6b7b1a5918e4206d746161b1f8ea2 Mon Sep 17 00:00:00 2001
From: "michael.rabellino" <michael.rabellino@noaa.gov>
Date: Mon, 15 Jul 2024 15:44:24 -0600
Subject: [PATCH] dev env endpoint couchdb update

---
 couchdb/uat/Dockerfile | 12 +++++++++--
 couchdb/uat/startup.sh | 48 ++++++++++++++++++++++++++++++++++++++++++
 couchdb/uat/uat.sh     | 23 --------------------
 3 files changed, 58 insertions(+), 25 deletions(-)
 create mode 100644 couchdb/uat/startup.sh
 delete mode 100644 couchdb/uat/uat.sh

diff --git a/couchdb/uat/Dockerfile b/couchdb/uat/Dockerfile
index eaf2bc2b..a3df739c 100644
--- a/couchdb/uat/Dockerfile
+++ b/couchdb/uat/Dockerfile
@@ -1,4 +1,12 @@
 FROM couchdb:latest
+
+ENV COUCHDB_USER=admin
+ENV COUCHDB_PASSWORD=admin
+
 EXPOSE 5984
-COPY uat.sh uat.sh
-RUN sh uat.sh
\ No newline at end of file
+
+COPY startup.sh /usr/local/bin/startup.sh
+
+RUN chmod +x /usr/local/bin/startup.sh
+
+ENTRYPOINT [ "/usr/local/bin/startup.sh" ]
\ No newline at end of file
diff --git a/couchdb/uat/startup.sh b/couchdb/uat/startup.sh
new file mode 100644
index 00000000..4be281ad
--- /dev/null
+++ b/couchdb/uat/startup.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+# create some basic configurations
+cat >/opt/couchdb/etc/local.ini <<EOF
+[couchdb]
+single_node=true
+
+[admins]
+admin = admin
+EOF
+
+#nohup bash -c "/docker-entrypoint.sh /opt/couchdb/bin/couchdb &"
+#sleep 5
+
+# Start CouchDB in the background
+/opt/couchdb/bin/couchdb &
+
+# Wait for CouchDB to start
+until curl -s http://127.0.0.1:5984/_up; do
+  echo "Waiting for CouchDB to start..."
+  sleep 1
+done
+
+# Curl the _users table
+echo "Curling the _users table..."
+curl -s -u $COUCHDB_USER:$COUCHDB_PASSWORD http://127.0.0.1:5984/_users
+
+# Curl the _replicator table
+echo "Curling the _replicator table..."
+curl -s -u $COUCHDB_USER:$COUCHDB_PASSWORD http://127.0.0.1:5984/_replicator
+
+# Bring CouchDB to the foreground
+wait
+
+
+
+#!/bin/sh -xe
+
+
+
+#curl -X PUT http://admin:admin@127.0.0.1:5984/_users
+#curl -X PUT http://admin:admin@127.0.0.1:5984/_replicator
+#curl -X PUT http://admin:admin@127.0.0.1:5984/idss  
+
+# Bring CouchDB to the foreground
+#wait
+
+# this is handled by the loader python script instead
\ No newline at end of file
diff --git a/couchdb/uat/uat.sh b/couchdb/uat/uat.sh
deleted file mode 100644
index 53198e6b..00000000
--- a/couchdb/uat/uat.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh -xe
-
-# create some basic configurations
-cat >/opt/couchdb/etc/local.ini <<EOF
-[couchdb]
-single_node=true
-
-[admins]
-admin = admin
-EOF
-
-nohup bash -c "/docker-entrypoint.sh /opt/couchdb/bin/couchdb &"
-sleep 15
-
-curl -X PUT http://admin:admin@127.0.0.1:5984/_users
-curl -X PUT http://admin:admin@127.0.0.1:5984/_replicator
-curl -X PUT http://admin:admin@127.0.0.1:5984/idss  
-
-# this is handled by the loader python script instead
-#curl -vX POST http://admin:admin@127.0.0.1:5984/idss -d @- -# -o output -H "Content-Type: application/json" < '{"_id": "_design/event","views": {"idents": {"map": "function(doc) { emit(doc.event.corrId.uuid, doc.event.corrId); }",},"uuids": {"map": "function(doc) { emit(doc.event.corrId.uuid, 1); }","reduce": "function(k,v) {return sum(v); }",},}}'
-#curl -vX POST http://admin:admin@127.0.0.1:5984/idss -d @- -# -o output -H "Content-Type: application/json" < EventPort_IDSSe_11111111-beec-467b-a0e6-9d215b715b97_20221223-120000.json
-#curl -vX POST http://admin:admin@127.0.0.1:5984/idss -d @- -# -o output -H "Content-Type: application/json" < EventPort_IDSSe_22222222-beec-467b-a0e6-9d215b715b97_20221223-120000.json
-#curl -vX POST http://admin:admin@127.0.0.1:5984/idss -d @- -# -o output -H "Content-Type: application/json" < EventPort_IDSSe_33333333-beec-467b-a0e6-9d215b715b97_20221223-120000.json