fix enabling erlang query server (#11)

Author: langalex

.github/workflows/test.yml

@@ -2,24 +2,25 @@ name: Test
 on:
   push:
     branches:
-    - master
+      - master
   pull_request:
     branches:
-    - master
+      - master
 jobs:
   tests:
     runs-on: ubuntu-latest
+    timeout-minutes: 2
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up CouchDB
-      uses: ./
-      with:
-        couchdb version: '2.3.1'
-    - name: Test that CouchDB can be accessed
-      run: curl -sS -f http://127.0.0.1:5984/
-    - name: Test that system databases are there
-      run: curl -sS -f http://127.0.0.1:5984/_users
-    - name: Test that the Erlang query server is enabled
-      run: |
-        curl -sS -f 'http://127.0.0.1:5984/_users/_design/test' -X PUT -H 'Content-Type: application/json' --data '{"views":{"test":{"map":"fun({Doc}) -> Emit(proplists:get_value(<<\"name\">>, Doc, null), 1) end."}},"language":"erlang"}'
-        curl -sS -f 'http://127.0.0.1:5984/_users/_design/test/_view/test'
+      - uses: actions/checkout@v1
+      - name: Set up CouchDB
+        uses: ./
+        with:
+          couchdb version: "2.3.1"
+      - name: Test that CouchDB can be accessed
+        run: curl -sS -f http://127.0.0.1:5984/
+      - name: Test that system databases are there
+        run: curl -sS -f http://127.0.0.1:5984/_users
+      - name: Test that the Erlang query server is enabled
+        run: |
+          curl -sS -f 'http://admin:admin@127.0.0.1:5984/_users/_design/test' -X PUT -H 'Content-Type: application/json' --data '{"views":{"test":{"map":"fun({Doc}) -> Emit(proplists:get_value(<<\"name\">>, Doc, null), 1) end."}},"language":"erlang"}'
+          curl -sS -f 'http://admin:admin@127.0.0.1:5984/_users/_design/test/_view/test'

01-github-action-custom.ini

@@ -0,0 +1,13 @@
+[couchdb]
+database_dir = /ram_disk
+view_index_dir = /ram_disk
+delayed_commits = true
+
+[httpd]
+socket_options = [{nodelay, true}]
+
+[native_query_servers]
+erlang = {couch_native_process, start_link, []}
+
+[admins]
+admin = admin

Dockerfile

@@ -1,7 +1,5 @@
 FROM docker:stable
-RUN apk add --no-cache curl
-
-RUN mkdir -p /opt/couchdb/etc/local.d && echo "[couchdb]\ndatabase_dir = /ram_disk\nview_index_dir = /ram_disk\ndelayed_commits = true\n[httpd]\nsocket_options = [{nodelay, true}]\n[native_query_servers]\nerlang = {couch_native_process, start_link, []}" >> /opt/couchdb/etc/local.d/01-github-action-custom.ini
+RUN apk add --no-cache curl sed
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

Dockerfile.couchdb

@@ -0,0 +1,4 @@
+FROM couchdb:COUCHDB_VERSION
+
+RUN mkdir -p /opt/couchdb/etc/local.d
+COPY 01-github-action-custom.ini /opt/couchdb/etc/local.d/01-github-action-custom.ini

README.md

@@ -1,23 +1,25 @@
 # CouchDB GitHub Action
 
 This [GitHub Action](https://github.com/features/actions) sets up a CouchDB database.
+
 The Erlang query server is enabled.
+A default user "admin" with the password "admin" is created.
 
 # Usage
 
 See [action.yml](action.yml) and [test.yml](.github/workflows/test.yml).
 
 Basic:
+
 ```yaml
 steps:
   - name: Set up CouchDB
     uses: "cobot/couchdb-action@master"
     with:
-      couchdb version: '2.3.1'
+      couchdb version: "2.3.1"
   - name: Do something
     run: |
-      curl http://127.0.0.1:5984/
-
+      curl http://admin:admin@127.0.0.1:5984/
 ```
 
 # Contributions

entrypoint.sh

@@ -1,17 +1,26 @@
 #!/bin/sh
 
 echo "Starting Docker..."
-sh -c "docker run -d -p 5984:5984 -p 5986:5986 --tmpfs /ram_disk couchdb:$INPUT_COUCHDB_VERSION"
+sed -i "s/COUCHDB_VERSION/$INPUT_COUCHDB_VERSION/" Dockerfile.couchdb
+docker build --tag couchdb -f Dockerfile.couchdb .
+docker run -d -p 5984:5984 -p 5986:5986 --tmpfs /ram_disk couchdb
 
 # CouchDB container name
 export NAME=`docker ps --format "{{.Names}}" --last 1`
 
 wait_for_couchdb() {
   echo "Waiting for CouchDB..."
   hostip=$(ip route show | awk '/default/ {print $3}')
+  retries=0
+  max_retries=20
 
   while ! curl -f http://$hostip:5984/ &> /dev/null
   do
+    retries=$((retries+1))
+    if [ $retries -ge $max_retries ]; then
+      echo "CouchDB did not become available after $max_retries attempts. Exiting."
+      exit 1
+    fi
     echo "."
     sleep 1
   done
@@ -20,6 +29,6 @@ wait_for_couchdb
 
 # Set up system databases
 echo "Setting up CouchDB system databases..."
-docker exec $NAME curl -sS 'http://127.0.0.1:5984/_users' -X PUT -H 'Content-Type: application/json' --data '{"id":"_users","name":"_users"}' > /dev/null
-docker exec $NAME curl -sS 'http://127.0.0.1:5984/_global_changes' -X PUT -H 'Content-Type: application/json' --data '{"id":"_global_changes","name":"_global_changes"}' > /dev/null
-docker exec $NAME curl -sS 'http://127.0.0.1:5984/_replicator' -X PUT -H 'Content-Type: application/json' --data '{"id":"_replicator","name":"_replicator"}' > /dev/null
+docker exec $NAME curl -sS 'http://admin:admin@127.0.0.1:5984/_users' -X PUT -H 'Content-Type: application/json' --data '{"id":"_users","name":"_users"}' > /dev/null
+docker exec $NAME curl -sS 'http://admin:admin@127.0.0.1:5984/_global_changes' -X PUT -H 'Content-Type: application/json' --data '{"id":"_global_changes","name":"_global_changes"}' > /dev/null
+docker exec $NAME curl -sS 'http://admin:admin@127.0.0.1:5984/_replicator' -X PUT -H 'Content-Type: application/json' --data '{"id":"_replicator","name":"_replicator"}' > /dev/null