Jannick Knudsen 6 år sedan
förälder
incheckning
290ecf3a0a
29 ändrade filer med 27 tillägg och 10 borttagningar
  1. 2 0
      .dockerignore
  2. 2 0
      .gitignore
  3. 3 3
      Dockerfile
  4. BIN
      data/data/.shards/20000000-3fffffff/_replicator.1554004331_design/mrview/3e823c2a4383ac0c18d4e574135a5b08.view
  5. BIN
      data/data/.shards/80000000-9fffffff/_replicator.1554004331_design/mrview/3e823c2a4383ac0c18d4e574135a5b08.view
  6. BIN
      data/data/.shards/c0000000-dfffffff/_replicator.1554004331_design/mrview/3e823c2a4383ac0c18d4e574135a5b08.view
  7. BIN
      data/data/_dbs.couch
  8. BIN
      data/data/_nodes.couch
  9. BIN
      data/data/_replicator.couch
  10. BIN
      data/data/_users.couch
  11. BIN
      data/data/shards/00000000-1fffffff/_replicator.1554004331.couch
  12. BIN
      data/data/shards/00000000-1fffffff/helloworld.1554004334.couch
  13. BIN
      data/data/shards/20000000-3fffffff/_replicator.1554004331.couch
  14. BIN
      data/data/shards/20000000-3fffffff/helloworld.1554004334.couch
  15. BIN
      data/data/shards/40000000-5fffffff/_replicator.1554004331.couch
  16. BIN
      data/data/shards/40000000-5fffffff/helloworld.1554004334.couch
  17. BIN
      data/data/shards/60000000-7fffffff/_replicator.1554004331.couch
  18. BIN
      data/data/shards/60000000-7fffffff/helloworld.1554004334.couch
  19. BIN
      data/data/shards/80000000-9fffffff/_replicator.1554004331.couch
  20. BIN
      data/data/shards/80000000-9fffffff/helloworld.1554004334.couch
  21. BIN
      data/data/shards/a0000000-bfffffff/_replicator.1554004331.couch
  22. BIN
      data/data/shards/a0000000-bfffffff/helloworld.1554004334.couch
  23. BIN
      data/data/shards/c0000000-dfffffff/_replicator.1554004331.couch
  24. BIN
      data/data/shards/c0000000-dfffffff/helloworld.1554004334.couch
  25. BIN
      data/data/shards/e0000000-ffffffff/_replicator.1554004331.couch
  26. BIN
      data/data/shards/e0000000-ffffffff/helloworld.1554004334.couch
  27. 2 4
      docker-entrypoint.sh
  28. 4 1
      rundocker.sh
  29. 14 2
      start.sh

+ 2 - 0
.dockerignore

@@ -1 +1,3 @@
 data
+data2
+_out

+ 2 - 0
.gitignore

@@ -1 +1,3 @@
 data
+data2
+_out

+ 3 - 3
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 /app/data/data /app/data/log; \
-        chown couchdb:couchdb /app/data/data /app/data/log; \
-        chmod 777 /app/data/data /app/data/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; \
 # Remove file that sets logging to a file
         rm /opt/couchdb/etc/default.d/10-filelog.ini; \
         rm -rf /var/lib/apt/lists/*

BIN
data/data/.shards/20000000-3fffffff/_replicator.1554004331_design/mrview/3e823c2a4383ac0c18d4e574135a5b08.view


BIN
data/data/.shards/80000000-9fffffff/_replicator.1554004331_design/mrview/3e823c2a4383ac0c18d4e574135a5b08.view


BIN
data/data/.shards/c0000000-dfffffff/_replicator.1554004331_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 - 4
docker-entrypoint.sh

@@ -38,10 +38,8 @@ if [ "$1" = '/opt/couchdb/bin/couchdb' ]; then
 	# when it creates the files. The approach taken here ensures that the
 	# contents of the datadir have the same permissions as they had when they
 	# were initially created. This should minimize any startup delay.
-	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
+	find /opt/couchdb/data -type d ! -perm 0755 -exec chmod -f 0755 '{}' +
+	find /opt/couchdb/data -type f ! -perm 0644 -exec chmod -f 0644 '{}' +
 
 	# Do the same thing for configuration files and directories. Technically
 	# CouchDB only needs read access to the configuration files as all online

+ 4 - 1
rundocker.sh

@@ -27,4 +27,7 @@ docker run   -e MYSQL_HOST=$MYIP \
 			 cdb
 
 
-docker logs cdb -f
+docker logs cdb -f
+
+
+#			 --read-only \

+ 14 - 2
start.sh

@@ -1,7 +1,19 @@
 #!/bin/bash
 
+if [[ -d "/app/data/couchdb" ]]; then
+	echo "ok data"
+else	
+	mkdir -p /app/data/couchdb
+	chown couchdb:couchdb /app/data/couchdb
+	cp -rf /opt/couchdb/* /app/data/couchdb/
+fi
 
-echo "OK"
 
 
-/docker-entrypoint.sh /opt/couchdb/bin/couchdb
+echo "OK ??"
+
+ls -la /app/data
+
+echo "AHH"
+
+/docker-entrypoint.sh /app/data/couchdb/bin/couchdb