switch voxpupuli/container-puppetserver to voxpupuli/puppetserver, suppress docker CLI hints

Signed-off-by: circa10a <caleblemoine@gmail.com>

Author: circa10a

auth.conf

@@ -2,13 +2,25 @@ authorization: {
     version: 1
     rules: [
         {
-            match-request: {
-                path: ".*"
-                type: regex
-            }
-            allow-unauthenticated: true
-            sort-order: 1
-            name: "allow all"
+            "allow-unauthenticated": true,
+            "match-request": {
+                "path": ".*",
+                "type": "regex"
+            },
+            "name": "allow all",
+            "sort-order": 1
         }
+    ,
+        {
+            "allow": "*",
+            "match-request": {
+                "method": "delete",
+                "path": "/puppet-admin-api/v1/environment-cache",
+                "type": "path"
+            },
+            "name": "puppet admin api clear caches",
+            "sort-order": 500
+        }
+    
     ]
 }

docker-compose.yml

@@ -1,8 +1,8 @@
 services:
-  puppet:
-    container_name: puppet
+  puppetserver:
+    container_name: puppetserver
     hostname: puppet
-    image: voxpupuli/container-puppetserver
+    image: voxpupuli/puppetserver
     environment:
       PUPPETSERVER_ENVIRONMENT_TIMEOUT: 0
     ports:

run_puppet_agent.sh

@@ -2,12 +2,15 @@
 
 # Run puppet agent every 15 seconds
 INTERVAL=15
-CONTAINER_NAME=puppet
+CONTAINER_NAME=puppetserver
 MODULE_DIR=/etc/puppetlabs/code/environments/production/modules
 PUPPETFILE=/etc/puppetlabs/code/environments/production/Puppetfile
 
+# Suppress 'What's New' messages
+export DOCKER_CLI_HINTS=false
+
 # Check that container is running
-if [[ $(docker ps --filter "name=^/$CONTAINER_NAME$" --format '{{.Names}}') == $CONTAINER_NAME ]]; then
+if docker container inspect "$CONTAINER_NAME" > /dev/null 2>&1; then
   # Update package sources
   # Install deps
   docker exec -it $CONTAINER_NAME bash -c "r10k puppetfile install --verbose --puppetfile=$PUPPETFILE --moduledir=$MODULE_DIR"
@@ -16,4 +19,7 @@ if [[ $(docker ps --filter "name=^/$CONTAINER_NAME$" --format '{{.Names}}') == $
       docker exec -it $CONTAINER_NAME puppet agent -t
       sleep $INTERVAL
     done
-fi
+else
+  echo "'${CONTAINER_NAME}' container is not running. Run 'docker compose up' and try again"
+  exit 1
+fi