Merge pull request #308 from marklogic/feature/docker-fix

Updated Docker to use official images

Author: rjrudin

.env

@@ -1,3 +1,3 @@
 # Defines environment variables for docker-compose.
 # Can be overridden via e.g. `MARKLOGIC_TAG=latest-10.0 docker-compose up -d --build`.
-MARKLOGIC_TAG=11.2.0-centos-1.1.2
+MARKLOGIC_TAG=latest

CONTRIBUTING.md

@@ -7,22 +7,22 @@ described below, you must use Java 17 or higher.
 # Setup
 
 To begin, you need to deploy the test application in this project to MarkLogic. You can do so either on your own 
-installation of MarkLogic, or you can use `docker-compose` to install MarkLogic, optionally as a 3-node cluster with 
+installation of MarkLogic, or you can use `docker compose` to install MarkLogic, optionally as a 3-node cluster with 
 a load balancer in front of it.
 
-## Installing MarkLogic with docker-compose
+## Installing MarkLogic with docker compose
 
-If you wish to use `docker-compose`, perform the following steps before deploying the test application.
+If you wish to use `docker compose`, perform the following steps before deploying the test application.
 
 1. [Install Docker](https://docs.docker.com/get-docker/).
 2. Ensure that you don't have a MarkLogic instance running locally (if you do, you may run into port conflicts in 
    the next step).
-3. Run `docker-compose up -d --build`.
+3. Run `docker compose up -d --build`.
 
 The above will result in a new MarkLogic instance with a single node. 
 
 Alternatively, if you would like to test against a 3-node MarkLogic cluster with a load balancer in front of it, 
-run `docker-compose -f docker-compose-3nodes.yaml up -d --build`.
+run `docker compose -f docker-compose-3nodes.yaml up -d --build`.
 
 ## Deploying the test application
 
@@ -89,7 +89,7 @@ This project's `docker-compose-3nodes.yaml` file includes
 [Grafana, Loki, and promtail services](https://grafana.com/docs/loki/latest/clients/promtail/) for the primary reason of
 collecting MarkLogic log files and allowing them to be viewed and searched via Grafana.
 
-Once you have run `docker-compose`, you can access Grafana at http://localhost:3000 . Follow these instructions to
+Once you have run `docker compose`, you can access Grafana at http://localhost:3000 . Follow these instructions to
 access MarkLogic logging data:
 
 1. Click on the hamburger in the upper left hand corner and select "Explore", or simply go to

build.gradle

@@ -93,6 +93,7 @@ test {
   environment "mlHost", mlHost
 }
 
+// See https://docs.gradle.org/current/userguide/jacoco_plugin.html .
 jacocoTestReport {
   dependsOn test
   reports {
@@ -104,8 +105,6 @@ sonar {
   properties {
     property "sonar.projectKey", "marklogic-spark"
     property "sonar.host.url", "http://localhost:9000"
-    // See https://github.com/dependency-check/dependency-check-sonar-plugin for more information.
-    property "sonar.dependencyCheck.jsonReportPath", "build/reports/dependency-check-report.json"
   }
 }
 

docker-compose-3nodes.yaml

@@ -1,4 +1,3 @@
-version: '3.8'
 name: marklogic_spark_3nodes
 
 services:
@@ -30,7 +29,7 @@ services:
   # by this host. Note that each MarkLogic host has its 8000-8002 ports exposed externally so that the apps on those
   # ports can each be accessed if needed.
   bootstrap_3n:
-    image: "marklogicdb/marklogic-db:${MARKLOGIC_TAG}"
+    image: "progressofficial/marklogic-db:${MARKLOGIC_TAG}"
     platform: linux/amd64
     container_name: bootstrap_3n
     hostname: bootstrap_3n.local
@@ -50,7 +49,7 @@ services:
       - internal_net
 
   node2:
-    image: "marklogicdb/marklogic-db:${MARKLOGIC_TAG}"
+    image: "progressofficial/marklogic-db:${MARKLOGIC_TAG}"
     platform: linux/amd64
     container_name: node2
     hostname: node2.local
@@ -74,7 +73,7 @@ services:
       - internal_net
 
   node3:
-    image: "marklogicdb/marklogic-db:${MARKLOGIC_TAG}"
+    image: "progressofficial/marklogic-db:${MARKLOGIC_TAG}"
     platform: linux/amd64
     container_name: node3
     hostname: node3.local

docker-compose.yaml

@@ -4,7 +4,7 @@ name: marklogic_spark
 services:
 
   marklogic:
-    image: "marklogicdb/marklogic-db:${MARKLOGIC_TAG}"
+    image: "progressofficial/marklogic-db:${MARKLOGIC_TAG}"
     platform: linux/amd64
     environment:
       - MARKLOGIC_INIT=true