From 0e0730f7afa67a8ab1a30ac146c580011fe4fee9 Mon Sep 17 00:00:00 2001
From: Nick Yeoman <c@nickyeoman.com>
Date: Thu, 1 Aug 2024 20:08:19 -0700
Subject: [PATCH] updated nocodb

---
 _builder/readme-new.sh    |  2 +-
 nocodb/README.md          | 13 ++++++++++
 nocodb/docker-compose.yml | 52 +++++++--------------------------------
 nocodb/old.yml            | 39 +++++++++++++++++++++++++++++
 nocodb/sample-extends.yml |  7 ++++++
 nocodb/sample.env         |  5 ++++
 6 files changed, 74 insertions(+), 44 deletions(-)
 create mode 100644 nocodb/README.md
 create mode 100644 nocodb/old.yml
 create mode 100644 nocodb/sample-extends.yml
 create mode 100644 nocodb/sample.env

diff --git a/_builder/readme-new.sh b/_builder/readme-new.sh
index 9bd9916..6637265 100644
--- a/_builder/readme-new.sh
+++ b/_builder/readme-new.sh
@@ -17,7 +17,7 @@ generate_readme() {
   readme_content+="## Overview\n"
   readme_content+="Docker Hub: \n"
   readme_content+="Project: \n"
-  readme_content+="Composer Example: \n"
+  readme_content+="Docker Compose Example: \n"
   readme_content+="Proxy Port: \n"
 
   # Description
diff --git a/nocodb/README.md b/nocodb/README.md
new file mode 100644
index 0000000..bf4e1ba
--- /dev/null
+++ b/nocodb/README.md
@@ -0,0 +1,13 @@
+# nocodb
+
+Last Updated: Thu August 01, 2024 18:40:57 PDT
+
+## Overview
+Docker Hub: https://hub.docker.com/r/nocodb/nocodb
+Project: https://nocodb.com/
+Docker Compose Example: https://github.com/nocodb/nocodb/blob/master/docker-compose/mysql/docker-compose.yml
+Proxy Port: 8080
+
+## Description
+
+This project is setup to use sql lite.  Although it can use mysql with some env vars.
diff --git a/nocodb/docker-compose.yml b/nocodb/docker-compose.yml
index b756549..f4d8628 100644
--- a/nocodb/docker-compose.yml
+++ b/nocodb/docker-compose.yml
@@ -1,44 +1,10 @@
----
-version: "2.1"
+version: '3.8'
 
-# https://github.com/nocodb/nocodb/blob/master/docker-compose/mysql/docker-compose.yml
-
-services: 
-  nocodb: 
-    depends_on: 
-      root_db: 
-        condition: service_healthy
-    environment: 
-      NC_DB: "mysql2://root_db:3306?u=noco&p=password&d=root_db"
-    image: "nocodb/nocodb:latest"
-    ports: 
-      - "8000:8080"
-    restart: always
-    volumes: 
-      - "nc_data:/usr/app/data"
-
-  root_db: 
-    environment: 
-      MYSQL_DATABASE: root_db
-      MYSQL_PASSWORD: password
-      MYSQL_ROOT_PASSWORD: password
-      MYSQL_USER: noco
-    healthcheck: 
-      retries: 10
-      test: 
-        - CMD
-        - mysqladmin
-        - ping
-        - "-h"
-        - localhost
-      timeout: 20s
-    image: "mysql:8.0.32"
-    restart: always
-    volumes: 
-      - "db_data:/var/lib/mysql"
-#    below line shows how to change charset and collation
-#    uncomment it if necessary
-#    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-volumes: 
-  db_data: {}
-  nc_data: {}
+services:
+  nc:
+    image: ${NOCODB_IMAGE:-nocodb/nocodb:latest}
+    restart: unless-stopped
+    # environment:
+    #   - NC_DB=${NCDB_NC_DB:-mysql2://root_db:3306?u=noco&p=password&d=root_db}
+    volumes:
+      - "${VOL_PATH:-./data}/nc_data:/usr/app/data"
diff --git a/nocodb/old.yml b/nocodb/old.yml
new file mode 100644
index 0000000..6826ccf
--- /dev/null
+++ b/nocodb/old.yml
@@ -0,0 +1,39 @@
+services: 
+  nocodb: 
+    depends_on: 
+      root_db: 
+        condition: service_healthy
+    environment: 
+      NC_DB: "mysql2://root_db:3306?u=noco&p=password&d=root_db"
+    image: "nocodb/nocodb:latest"
+    ports: 
+      - "8000:8080"
+    restart: always
+    volumes: 
+      - "nc_data:/usr/app/data"
+
+  root_db: 
+    environment: 
+      MYSQL_DATABASE: root_db
+      MYSQL_PASSWORD: password
+      MYSQL_ROOT_PASSWORD: password
+      MYSQL_USER: noco
+    healthcheck: 
+      retries: 10
+      test: 
+        - CMD
+        - mysqladmin
+        - ping
+        - "-h"
+        - localhost
+      timeout: 20s
+    image: "mysql:8.0.32"
+    restart: always
+    volumes: 
+      - "db_data:/var/lib/mysql"
+#    below line shows how to change charset and collation
+#    uncomment it if necessary
+#    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+volumes: 
+  db_data: {}
+  nc_data: {}
diff --git a/nocodb/sample-extends.yml b/nocodb/sample-extends.yml
new file mode 100644
index 0000000..c860fe9
--- /dev/null
+++ b/nocodb/sample-extends.yml
@@ -0,0 +1,7 @@
+version: '3.4'
+
+services:
+  nc:
+    extends:
+      file: ${COOKBOOK}/nocodb/docker-compose.yml
+      service: nc
diff --git a/nocodb/sample.env b/nocodb/sample.env
new file mode 100644
index 0000000..2d6e573
--- /dev/null
+++ b/nocodb/sample.env
@@ -0,0 +1,5 @@
+
+COOKBOOK=/git/docker-compose-cookbooks #HELP: cookbooks
+# nocodb
+#NOCODB_mysql2=//root_db:3306?u=noco&p=password&d=root_db
+NOCODB_IMAGE=nocodb/nocodb:latest
\ No newline at end of file