فهرست منبع

Bumped version to 0.0.3

Jannick Knudsen 6 سال پیش
والد
کامیت
f20016de96
28فایلهای تغییر یافته به همراه41 افزوده شده و 8 حذف شده
  1. 1 1
      CloudronManifest.json
  2. 5 5
      Dockerfile
  3. 1 1
      VERSION
  4. 1 0
      VERSIONLOG
  5. BIN
      data/data/._users_design/mrview/3e823c2a4383ac0c18d4e574135a5b08.view
  6. BIN
      data/data/_dbs.couch
  7. BIN
      data/data/_nodes.couch
  8. BIN
      data/data/_replicator.couch
  9. BIN
      data/data/_users.couch
  10. BIN
      data/data/shards/00000000-1fffffff/_replicator.1554004331.couch
  11. BIN
      data/data/shards/00000000-1fffffff/helloworld.1554004334.couch
  12. BIN
      data/data/shards/20000000-3fffffff/_replicator.1554004331.couch
  13. BIN
      data/data/shards/20000000-3fffffff/helloworld.1554004334.couch
  14. BIN
      data/data/shards/40000000-5fffffff/_replicator.1554004331.couch
  15. BIN
      data/data/shards/40000000-5fffffff/helloworld.1554004334.couch
  16. BIN
      data/data/shards/60000000-7fffffff/_replicator.1554004331.couch
  17. BIN
      data/data/shards/60000000-7fffffff/helloworld.1554004334.couch
  18. BIN
      data/data/shards/80000000-9fffffff/_replicator.1554004331.couch
  19. BIN
      data/data/shards/80000000-9fffffff/helloworld.1554004334.couch
  20. BIN
      data/data/shards/a0000000-bfffffff/_replicator.1554004331.couch
  21. BIN
      data/data/shards/a0000000-bfffffff/helloworld.1554004334.couch
  22. BIN
      data/data/shards/c0000000-dfffffff/_replicator.1554004331.couch
  23. BIN
      data/data/shards/c0000000-dfffffff/helloworld.1554004334.couch
  24. BIN
      data/data/shards/e0000000-ffffffff/_replicator.1554004331.couch
  25. BIN
      data/data/shards/e0000000-ffffffff/helloworld.1554004334.couch
  26. 2 0
      docker-entrypoint.sh
  27. 1 1
      package.json
  28. 30 0
      rundocker.sh

+ 1 - 1
CloudronManifest.json

@@ -5,7 +5,7 @@
     "description": "file://DESCRIPTION.md",
     "changelog": "./CHANGELOG",
     "tagline": "cdb",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "healthCheckPath": "/",
     "httpPort": 5984,
     "addons": {

+ 5 - 5
Dockerfile

@@ -107,9 +107,9 @@ RUN set -xe; \
 # Undo symlinks to /var/log and /var/lib
         rmdir /var/lib/couchdb /var/log/couchdb; \
         rm /opt/couchdb/data /opt/couchdb/var/log; \
-        mkdir -p /opt/couchdb/data /opt/couchdb/var/log; \
-        chown couchdb:couchdb /opt/couchdb/data /opt/couchdb/var/log; \
-        chmod 777 /opt/couchdb/data /opt/couchdb/var/log; \
+        mkdir -p /app/data/data /app/data/log; \
+        chown couchdb:couchdb /app/data/data /app/data/log; \
+        chmod 777 /app/data/data /app/data/log; \
 # Remove file that sets logging to a file
         rm /opt/couchdb/etc/default.d/10-filelog.ini; \
         rm -rf /var/lib/apt/lists/*
@@ -123,10 +123,10 @@ ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]
 
 # Setup directories and permissions
 RUN chown -R couchdb:couchdb /opt/couchdb/etc/default.d/ /opt/couchdb/etc/vm.args
-VOLUME /opt/couchdb/data
+#VOLUME /opt/couchdb/data
 
 # 5984: Main CouchDB endpoint
 # 4369: Erlang portmap daemon (epmd)
 # 9100: CouchDB cluster communication port
-EXPOSE 5984 4369 9100
+#EXPOSE 5984 4369 9100
 CMD ["/opt/couchdb/bin/couchdb"]

+ 1 - 1
VERSION

@@ -1 +1 @@
-v0.0.2
+v0.0.3

+ 1 - 0
VERSIONLOG

@@ -1,2 +1,3 @@
 v0.0.1
 v0.0.2
+v0.0.3

BIN
data/data/._users_design/mrview/3e823c2a4383ac0c18d4e574135a5b08.view


BIN
data/data/_dbs.couch


BIN
data/data/_nodes.couch


BIN
data/data/_replicator.couch


BIN
data/data/_users.couch


BIN
data/data/shards/00000000-1fffffff/_replicator.1554004331.couch


BIN
data/data/shards/00000000-1fffffff/helloworld.1554004334.couch


BIN
data/data/shards/20000000-3fffffff/_replicator.1554004331.couch


BIN
data/data/shards/20000000-3fffffff/helloworld.1554004334.couch


BIN
data/data/shards/40000000-5fffffff/_replicator.1554004331.couch


BIN
data/data/shards/40000000-5fffffff/helloworld.1554004334.couch


BIN
data/data/shards/60000000-7fffffff/_replicator.1554004331.couch


BIN
data/data/shards/60000000-7fffffff/helloworld.1554004334.couch


BIN
data/data/shards/80000000-9fffffff/_replicator.1554004331.couch


BIN
data/data/shards/80000000-9fffffff/helloworld.1554004334.couch


BIN
data/data/shards/a0000000-bfffffff/_replicator.1554004331.couch


BIN
data/data/shards/a0000000-bfffffff/helloworld.1554004334.couch


BIN
data/data/shards/c0000000-dfffffff/_replicator.1554004331.couch


BIN
data/data/shards/c0000000-dfffffff/helloworld.1554004334.couch


BIN
data/data/shards/e0000000-ffffffff/_replicator.1554004331.couch


BIN
data/data/shards/e0000000-ffffffff/helloworld.1554004334.couch


+ 2 - 0
docker-entrypoint.sh

@@ -41,6 +41,8 @@ if [ "$1" = '/opt/couchdb/bin/couchdb' ]; then
 	find /app/data/data -type d ! -perm 0755 -exec chmod -f 0755 '{}' +
 	find /app/data/data -type f ! -perm 0644 -exec chmod -f 0644 '{}' +
 
+	chown couchdb:couchdb /app/data/data -R
+
 	# Do the same thing for configuration files and directories. Technically
 	# CouchDB only needs read access to the configuration files as all online
 	# changes will be applied to the "docker.ini" file below, but we set 644

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdb",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "",
   "main": "index.js",
   "scripts": {

+ 30 - 0
rundocker.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+MYIP=$(ip route get 1 | awk '{print $NF;exit}')
+
+
+docker stop cdb
+docker rm cdb
+
+if [[ "$1" == "build" ]]; then
+	docker build -t cdb .
+fi
+
+docker run   -e MYSQL_HOST=$MYIP \
+			 -e MYSQL_PORT=3306 \
+			 -e MYSQL_USERNAME=root \
+			 -e MYSQL_PASSWORD=$(cat /home/jb/repos/cloudron/own/simsa/sql.pw) \
+			 -e MYSQL_DATABASE=akka \
+			 -e REDIS_HOST=$MYIP \
+			 -e REDIS_PORT=6379 \
+			 -e REDIS_PASSWORD="" \
+			 -e ERLANG_PORT=4369 \
+			 -e CLUSTER_PORT=9100 \
+			 -e APP_DOMAIN=http://127.0.0.1:5984 \
+			 -d \
+			 -p 5984:5984 \
+			 -v "$(pwd)/data:/app/data" \
+			 --name cdb \
+			 cdb
+
+
+docker logs cdb -f