Skip to content

Commit a4db0d6

Browse files
committed
Some modernization, to make things work again.
1 parent b15b3b5 commit a4db0d6

File tree

8 files changed

+12
-49
lines changed

8 files changed

+12
-49
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
4848
- name: Run the container.
4949
run: docker run -d --name=solr -p 8983:8983 geerlingguy/solr:${{ env.exact_version }}
50-
50+
5151
- name: Wait for the container to start
5252
run: sleep 10
5353

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ This project is composed of three main parts:
1212

1313
Currently maintained versions include:
1414

15-
- `9.x`, `9.4.1`, `latest`: Apache Solr 9.x
16-
- `8.x`, `8.11.2`: Apache Solr 8.x
15+
- `9.x`, `9.7.0`, `latest`: Apache Solr 9.x
16+
- `8.x`, `8.11.4`: Apache Solr 8.x
1717
- `7.x`, `7.7.3`: Apache Solr 7.x
1818

1919
## Standalone Usage

main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
gather_facts: false
55

66
vars:
7-
base_image: debian:buster
7+
base_image: debian:bookworm
88
container_name: solr_build_container
99
image_namespace: geerlingguy
1010
image_name: solr

roles/setup/meta/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ galaxy_info:
66
license: MIT
77

88
min_ansible_version: 2.10
9-
min_ansible_container_version: 0.9.2
109

1110
platforms:
1211
- name: Debian

roles/setup/tasks/install-5-prep.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

roles/setup/tasks/main.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
---
22
- name: Update apt cache.
3-
apt: update_cache=yes cache_valid_time=600
3+
apt:
4+
update_cache: true
5+
cache_valid_time: 600
46

57
- name: Ensure ps is installed.
6-
apt: name=procps state=present
7-
8-
- include_tasks: install-5-prep.yml
9-
when:
10-
- solr_version is version_compare('6.0.0', '<')
11-
- solr_version is version_compare('4.99.99', '>')
8+
apt:
9+
name: procps
10+
state: present

vars/8.x.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ java_packages:
44

55
solr_remove_cruft: true
66

7-
solr_version: "8.11.2"
7+
solr_version: "8.11.4"
88

99
container_working_dir: /
1010
container_start_command: '["/opt/solr/bin/solr", "start", "-f", "-force"]'

vars/9.x.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ java_packages:
44

55
solr_remove_cruft: true
66

7-
solr_version: "9.4.1"
7+
solr_version: "9.7.0"
88
# TODO: See https://github.com/geerlingguy/ansible-role-solr/issues/132
99
solr_cores: ~
1010

0 commit comments

Comments
 (0)