Merge pull request #31 from MITLibraries/infra-569-588

Update Matomo and Plugins

Author: cabutlermit

Dockerfile

@@ -1,4 +1,4 @@
-FROM matomo:5.4.0
+FROM matomo:5.5.1
   # checkov:skip=CKV_DOCKER_2:Skipping HEALTHCHECK configuration for now
   # checkov:skip=CKV_DOCKER_3:The container actually runs as www-data user
 
@@ -9,16 +9,16 @@ COPY ./files/plugin-EnvironmentVariables-5.0.3/ /var/www/html/plugins/Environmen
 COPY ./files/plugin-CustomVariables-5.0.4/ /var/www/html/plugins/CustomVariables
 
 # Add the HeatmapSessionRecording plugin
-COPY ./files/plugin-HeatmapSessionRecording-5.2.4/ /var/www/html/plugins/HeatmapSessionRecording
+COPY ./files/plugin-HeatmapSessionRecording-5.3.1/ /var/www/html/plugins/HeatmapSessionRecording
 
 # Add the UsersFlow plugin
-COPY ./files/plugin-UsersFlow-5.0.5/ /var/www/html/plugins/UsersFlow
+COPY ./files/plugin-UsersFlow-5.0.6/ /var/www/html/plugins/UsersFlow
 
 # Add the SearchEngineKeywordsPerformance plugin
-COPY ./files/plugin-SearchEngineKeywordsPerformance-5.0.22/ /var/www/html/plugins/SearchEngineKeywordsPerformance
+COPY ./files/plugin-SearchEngineKeywordsPerformance-5.0.23/ /var/www/html/plugins/SearchEngineKeywordsPerformance
 
 # Add the CustomReports plugin
-COPY ./files/plugin-CustomReports-5.4.3/ /var/www/html/plugins/CustomReports
+COPY ./files/plugin-CustomReports-5.4.5/ /var/www/html/plugins/CustomReports
 
 # Our custom configuration settings.
 COPY ./files/config.ini.php /var/www/html/config/config.ini.php

Makefile

@@ -24,29 +24,3 @@ publish-dev: dist-dev ## Build, tag and push (intended for developer-based manua
 	docker login -u AWS -p $$(aws ecr get-login-password --region us-east-1) $(ECR_URL_DEV)
 	docker push $(ECR_URL_DEV):latest
 	docker push $(ECR_URL_DEV):`git describe --always`
-
-### If this is a Lambda repo, uncomment the two lines below     ###
-# update-lambda-dev: ## Updates the lambda with whatever is the most recent image in the ecr (intended for developer-based manual update)
-#	aws lambda update-function-code --function-name $(FUNCTION_DEV) --image-uri $(ECR_URL_DEV):latest
-
-
-### Terraform-generated manual shortcuts for deploying to Stage. This requires  ###
-###   that ECR_NAME_STAGE, ECR_URL_STAGE, and FUNCTION_STAGE environment        ###
-###   variables are set locally by the developer and that the developer has     ###
-###   authenticated to the correct AWS Account. The values for the environment  ###
-###   variables can be found in the stage_build.yml caller workflow.            ###
-dist-stage: ## Only use in an emergency
-	docker build \
-		--platform linux/amd64 \
-	    -t $(ECR_URL_STAGE):latest \
-		-t $(ECR_URL_STAGE):`git describe --always` \
-		-t $(ECR_NAME_STAGE):latest .
-
-publish-stage: ## Only use in an emergency
-	docker login -u AWS -p $$(aws ecr get-login-password --region us-east-1) $(ECR_URL_STAGE)
-	docker push $(ECR_URL_STAGE):latest
-	docker push $(ECR_URL_STAGE):`git describe --always`
-
-### If this is a Lambda repo, uncomment the two lines below     ###
-# update-lambda-stage: ## Updates the lambda with whatever is the most recent image in the ecr (intended for developer-based manual update)
-#	aws lambda update-function-code --function-name $(FUNCTION_STAGE) --image-uri $(ECR_URL_STAGE):latest

docs/HowTos/HOWTO-premium-plugins.md

@@ -36,7 +36,7 @@ Before installing the license key, the *Marketplace* plugin must be activated. T
 According to the support team at Matomo, the premium license key can be installed in two instances of Matomo, "stage" and "prod." So, we can do some initial validation of a license key in Dev1, but the key cannot remain installed in the Dev1 instance. The license key installation can either be done by a user with "superuser" privileges in the Matomo web UI or it can be done by a member of InfraEng who has ssh access to the running container task/service. The CLI command is
 
 ```bash
-./console marketplace:set-license-key --license-key=LICENSE-KEY "<key>"
+./console marketplace:set-license-key --license-key=<license_key>
 ```
 
 This needs to be done once on each of the stage & prod instances of Matomo.