Merge pull request #118 from NaturalHistoryMuseum/josh/test_on_210

Add ckantest:next as a test target option

.github/workflows/main.yml

@@ -18,4 +18,4 @@ jobs:
       - name: Run tests
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-        run: docker-compose run -e COVERALLS_REPO_TOKEN ckan bash /opt/scripts/run-tests.sh -c ckanext.ldap
+        run: docker-compose run -e COVERALLS_REPO_TOKEN latest bash /opt/scripts/run-tests.sh -c ckanext.ldap

README.md

@@ -175,7 +175,7 @@ To run the tests against ckan 2.9.x on Python3:
    configuration, so you should only need to rebuild the ckan image if you change the extension's
    dependencies.
    ```shell
-   docker-compose run ckan
+   docker-compose run latest
    ```
 
 <!--testing-end-->

docker-compose.yml

@@ -1,10 +1,25 @@
 version: "3"
 
 services:
-  ckan:
+  latest:
     build:
       context: .
-      dockerfile: docker/Dockerfile
+      dockerfile: docker/Dockerfile_latest
+    environment:
+      PYTHONUNBUFFERED: 1
+      PYTHONDONTWRITEBYTECODE: 1
+    depends_on:
+      - db
+      - solr
+      - redis
+    volumes:
+      - ./ckanext:/base/src/ckanext-ldap/ckanext
+      - ./tests:/base/src/ckanext-ldap/tests
+
+  next:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile_next
     environment:
       PYTHONUNBUFFERED: 1
       PYTHONDONTWRITEBYTECODE: 1

docker/Dockerfile_next

@@ -0,0 +1,21 @@
+FROM naturalhistorymuseum/ckantest:next
+
+# required by python-ldap
+RUN apt-get -q -y install libldap2-dev libsasl2-dev \
+    && apt-get -q clean \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /base/src/ckanext-ldap
+
+# copy over the source
+COPY . .
+
+# install the base + test dependencies
+RUN pip install -e .[test]
+
+# this entrypoint ensures our service dependencies (postgresql, solr and redis) are running before
+# running the cmd
+ENTRYPOINT ["/bin/bash", "/opt/waits/basic.sh"]
+
+# run the tests with coverage output
+CMD ["bash", "/opt/scripts/run-tests.sh", "ckanext.ldap"]