chore: update naming to remove solr version specific

.env

@@ -1,2 +1,2 @@
 # Local project name - setting this here aligns container names with routes
-COMPOSE_PROJECT_NAME=drupal-solr8
+COMPOSE_PROJECT_NAME=drupal-solr

.github/workflows/drupal-example.yaml

@@ -4,11 +4,9 @@ on:
   push:
     branches:
       - 'main'
-      - 'solr8'
   pull_request:
     branches:
       - 'main'
-      - 'solr8'
 
 jobs:
   test-suite:
@@ -66,4 +64,4 @@ jobs:
     # - name: Show Lando logs
     #   continue-on-error: true
     #   run: |
-    #     docker compose -p drupalsolr8 logs
+    #     docker compose -p drupalsolr logs

.lagoon.yml

@@ -1,6 +1,6 @@
 docker-compose-yaml: docker-compose.yml
 
-project: drupal-solr8
+project: drupal-solr
 
 tasks:
 #   pre-rollout:
@@ -23,12 +23,3 @@ tasks:
         name: drush cr
         command: drush -y cr
         service: cli
-
-environments:
-  9.x:
-    # routes:
-    cronjobs:
-      - name: drush cron
-        schedule: "*/15 * * * *"
-        command: drush cron
-        service: cli

.lando.yml

@@ -1,4 +1,4 @@
-name: drupal-solr8
+name: drupal-solr
 recipe: lagoon
 config:
   flavor: drupal

README.md

@@ -30,7 +30,7 @@ To see similar projects with additional services, please visit https://github.co
 1. Checkout this project repo and confirm the path is in Docker's file sharing config - https://docs.docker.com/docker-for-mac/#file-sharing
 
     ```bash
-    git clone https://github.com/lagoon-examples/drupal-solr8.git drupal-solr8 && cd $_
+    git clone https://github.com/lagoon-examples/drupal-solr.git drupal-solr && cd $_
     ```
 
 2. Make sure you don't have anything running on port 80 on the host machine (like a web server) then run `pygmy-go up`
@@ -42,7 +42,7 @@ To see similar projects with additional services, please visit https://github.co
     docker compose exec cli composer install
     ```
 
-4. Visit the new site @ `http://drupal-solr8.docker.amazee.io`
+4. Visit the new site @ `http://drupal-solr.docker.amazee.io`
 
 * If any steps fail, you're safe to rerun from any point.
 Starting again from the beginning will just reconfirm the changes.
@@ -56,7 +56,7 @@ This repository is set up with a `.lando.yml` file, which allows you to use Land
 2. Checkout the project repo and confirm the path is in Docker's file sharing config - https://docs.docker.com/docker-for-mac/#file-sharing
 
     ```bash
-    git clone https://github.com/lagoon-examples/drupal-solr8.git drupal-solr8 && cd $_
+    git clone https://github.com/lagoon-examples/drupal-solr.git drupal-solr && cd $_
     ```
 
 3. Make sure you have pygmy-go stopped. Run `pygmy-go stop` to be sure.
@@ -73,7 +73,7 @@ lando start
 lando drush si -y
 ```
 
-6. Visit the new site @ `http://drupal-solr8.lndo.site`
+6. Visit the new site @ `http://drupal-solr.lndo.site`
  
 7. For more information on how to configure your site, check out the [documentation](https://docs.lando.dev/config/lagoon.html).
 

TESTING_dockercompose.md

@@ -1,4 +1,4 @@
-Docker Compose Drupal 9 Solr8 option  - php8, nginx, mariadb, solr8
+Docker Compose Drupal Solr8 option  - php8, nginx, mariadb, solr8
 ===================================================================
 
 This is a docker compose version of the Lagoon-example tests:
@@ -18,7 +18,7 @@ docker compose down
 docker compose build && docker compose up -d
 
 # Ensure mariadb pod is ready to connect
-docker run --rm --net drupal-solr8_default amazeeio/dockerize dockerize -wait tcp://mariadb:3306 -timeout 1m
+docker run --rm --net drupal-solr_default amazeeio/dockerize dockerize -wait tcp://mariadb:3306 -timeout 1m
 ```
 
 Verification commands
@@ -33,17 +33,17 @@ docker compose exec -T cli bash -c "drush cr -y"
 docker compose exec -T cli bash -c "drush status" | grep "Drupal bootstrap" | grep "Successful"
 
 # Should have all the services we expect
-docker ps --filter label=com.docker.compose.project=drupal-solr8 | grep Up | grep drupal-solr8-nginx-1
-docker ps --filter label=com.docker.compose.project=drupal-solr8 | grep Up | grep drupal-solr8-mariadb-1
-docker ps --filter label=com.docker.compose.project=drupal-solr8 | grep Up | grep drupal-solr8-php-1
-docker ps --filter label=com.docker.compose.project=drupal-solr8 | grep Up | grep drupal-solr8-cli-1
-docker ps --filter label=com.docker.compose.project=drupal-solr8 | grep Up | grep drupal-solr8-solr-1
+docker ps --filter label=com.docker.compose.project=drupal-solr | grep Up | grep drupal-solr-nginx-1
+docker ps --filter label=com.docker.compose.project=drupal-solr | grep Up | grep drupal-solr-mariadb-1
+docker ps --filter label=com.docker.compose.project=drupal-solr | grep Up | grep drupal-solr-php-1
+docker ps --filter label=com.docker.compose.project=drupal-solr | grep Up | grep drupal-solr-cli-1
+docker ps --filter label=com.docker.compose.project=drupal-solr | grep Up | grep drupal-solr-solr-1
 
 # Should ssh against the cli container by default
 docker compose exec -T cli bash -c "env | grep LAGOON=" | grep cli-drupal
 
 # Should have the correct environment set
-docker compose exec -T cli bash -c "env" | grep LAGOON_ROUTE | grep drupal-solr8.docker.amazee.io
+docker compose exec -T cli bash -c "env" | grep LAGOON_ROUTE | grep drupal-solr.docker.amazee.io
 docker compose exec -T cli bash -c "env" | grep LAGOON_ENVIRONMENT_TYPE | grep development
 
 # Should be running PHP 8

TESTING_lando.md

@@ -33,19 +33,19 @@ lando drush cr -y
 lando drush status | grep "Drupal bootstrap" | grep "Successful"
 
 # Should have all the services we expect
-docker ps --filter label=com.docker.compose.project=drupalsolr8 | grep Up | grep drupalsolr8_nginx_1
-docker ps --filter label=com.docker.compose.project=drupalsolr8 | grep Up | grep drupalsolr8_mariadb_1
-docker ps --filter label=com.docker.compose.project=drupalsolr8 | grep Up | grep drupalsolr8_mailhog_1
-docker ps --filter label=com.docker.compose.project=drupalsolr8 | grep Up | grep drupalsolr8_php_1
-docker ps --filter label=com.docker.compose.project=drupalsolr8 | grep Up | grep drupalsolr8_cli_1
-docker ps --filter label=com.docker.compose.project=drupalsolr8 | grep Up | grep drupalsolr8_lagooncli_1
-docker ps --filter label=com.docker.compose.project=drupalsolr8 | grep Up | grep drupalsolr8_solr_1
+docker ps --filter label=com.docker.compose.project=drupalsolr | grep Up | grep drupalsolr_nginx_1
+docker ps --filter label=com.docker.compose.project=drupalsolr | grep Up | grep drupalsolr_mariadb_1
+docker ps --filter label=com.docker.compose.project=drupalsolr | grep Up | grep drupalsolr_mailhog_1
+docker ps --filter label=com.docker.compose.project=drupalsolr | grep Up | grep drupalsolr_php_1
+docker ps --filter label=com.docker.compose.project=drupalsolr | grep Up | grep drupalsolr_cli_1
+docker ps --filter label=com.docker.compose.project=drupalsolr | grep Up | grep drupalsolr_lagooncli_1
+docker ps --filter label=com.docker.compose.project=drupalsolr | grep Up | grep drupalsolr_solr_1
 
 # Should ssh against the cli container by default
 lando ssh -c "env | grep LAGOON=" | grep cli-drupal
 
 # Should have the correct environment set
-lando ssh -c "env" | grep LAGOON_ROUTE | grep drupal-solr8.lndo.site
+lando ssh -c "env" | grep LAGOON_ROUTE | grep drupal-solr.lndo.site
 lando ssh -c "env" | grep LAGOON_ENVIRONMENT_TYPE | grep development
 
 # Should be running PHP 8

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "lagoon-examples/drupal-solr8",
+    "name": "lagoon-examples/drupal-solr",
     "description": "Project template for Drupal 9 projects with MariaDB, hosted on Lagoon",
     "type": "project",
     "license": "GPL-2.0-or-later",

docker-compose.yml

@@ -10,7 +10,7 @@ x-volumes:
 x-environment:
   &default-environment
     # Route that should be used locally, if you are using pygmy, this route *must* end with .docker.amazee.io
-    LAGOON_ROUTE: &default-url http://${COMPOSE_PROJECT_NAME:-drupal-solr8}.docker.amazee.io
+    LAGOON_ROUTE: &default-url http://${COMPOSE_PROJECT_NAME:-drupal-solr}.docker.amazee.io
     # Uncomment if you like to have the system behave like in production
     #LAGOON_ENVIRONMENT_TYPE: production
     # Uncomment to enable xdebug and then restart via `docker compose up -d`
@@ -35,7 +35,7 @@ services:
     build:
       context: .
       dockerfile: lagoon/cli.dockerfile
-    image: &cli-image ${COMPOSE_PROJECT_NAME:-drupal-solr8}-cli # this image will be reused as `CLI_IMAGE` in subsequent Docker builds
+    image: &cli-image ${COMPOSE_PROJECT_NAME:-drupal-solr}-cli # this image will be reused as `CLI_IMAGE` in subsequent Docker builds
     labels:
       # Lagoon Labels
       lagoon.type: cli-persistent

renovate.json

@@ -1,7 +1,6 @@
 {
   "baseBranches": [
-    "main",
-    "solr8"
+    "main"
   ],
   "extends": ["config:base"],
   "automerge": true,