Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/diagnostic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
killbill_account: "{{ killbill_account | default('') }}"
bundles_dir: "{{ kb_plugins_dir }}"
log_dir: "{{ catalina_base }}/logs"
tags: diagnostics
tags: diagnostics
2 changes: 1 addition & 1 deletion ansible/roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
set_fact: ansible_ruby_interpreter="{{ kpm_path }}/lib/ruby/bin/ruby"
tags: common
# noqa: var-naming[no-role-prefix]
# Required for ansible-lint: variable must stay named 'ansible_ruby_interpreter' for Ansible to pick it up
# Required for ansible-lint: variable must stay named 'ansible_ruby_interpreter' for Ansible to pick it up
8 changes: 4 additions & 4 deletions ansible/roles/kaui/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
owner: "{{ tomcat_owner }}"
group: "{{ tomcat_group }}"
# If the file already exist, don't clobber it
force: no
force: false
tags: kpm-install

# Generate Kaui-specific Tomcat configuration files based on environment variables
Expand All @@ -34,7 +34,7 @@
owner: "{{ tomcat_owner }}"
group: "{{ tomcat_group }}"
# If the files already exist, don't clobber them
force: no
force: false
with_items:
- src: kaui/conf
name: setenv2.sh
Expand Down Expand Up @@ -68,7 +68,7 @@
path: "{{ kaui_install_dir }}"
owner: "{{ tomcat_owner }}"
group: "{{ tomcat_group }}"
recurse: yes
recurse: true
tags: kpm-install

- name: Create ROOT directory to unarchive the WAR
Expand Down Expand Up @@ -108,7 +108,7 @@
ansible.builtin.file:
path: "{{ catalina_base }}/{{ kaui_webapps }}/ROOT"
state: directory
recurse: yes
recurse: true
owner: "{{ tomcat_owner }}"
group: "{{ tomcat_group }}"
mode: u=rwX,g=rX,o=rX
Expand Down
10 changes: 5 additions & 5 deletions ansible/roles/killbill/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
owner: "{{ tomcat_owner }}"
group: "{{ tomcat_group }}"
# If the files already exist, don't clobber them
force: no
force: false
with_items:
- name: killbill.properties
tags: kpm-install
Expand All @@ -36,7 +36,7 @@
owner: "{{ tomcat_owner }}"
group: "{{ tomcat_group }}"
# If the file already exist, don't clobber it
force: no
force: false
tags: kpm-install

# Generate Kill Bill-specific Tomcat configuration files based on environment variables
Expand All @@ -49,7 +49,7 @@
owner: "{{ tomcat_owner }}"
group: "{{ tomcat_group }}"
# If the files already exist, don't clobber them
force: no
force: false
with_items:
- src: killbill/conf
name: setenv2.sh
Expand Down Expand Up @@ -83,7 +83,7 @@
path: "{{ kb_install_dir }}"
owner: "{{ tomcat_owner }}"
group: "{{ tomcat_group }}"
recurse: yes
recurse: true
tags: kpm-install

- name: Create ROOT directory to unarchive the WAR
Expand Down Expand Up @@ -123,7 +123,7 @@
ansible.builtin.file:
path: "{{ catalina_base }}/{{ kb_webapps }}/ROOT"
state: directory
recurse: yes
recurse: true
owner: "{{ tomcat_owner }}"
group: "{{ tomcat_group }}"
mode: u=rwX,g=rX,o=rX
Expand Down
8 changes: 4 additions & 4 deletions ansible/roles/kpm/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
- name: Download kpm release metadata
ansible.builtin.uri:
url: "{{ nexus_url }}/{{ nexus_repository }}/org/kill-bill/billing/installer/kpm/maven-metadata.xml"
return_content: yes
return_content: true
register: kpm_metadata
when: kpm_version is undefined
tags: kpm
Expand Down Expand Up @@ -54,7 +54,7 @@
become: true
ansible.builtin.unarchive:
src: "{{ kpm_install_dir }}/kpm-{{ kpm_version }}-noarch.tar.gz"
remote_src: True
remote_src: true
dest: "{{ kpm_install_dir }}"
owner: "{{ kpm_owner }}"
group: "{{ kpm_group }}"
Expand Down Expand Up @@ -85,7 +85,7 @@
become: true
ansible.builtin.unarchive:
src: "{{ kpm_install_dir }}/kpm-{{ kpm_version }}-linux-{{ ansible_architecture }}.tar.gz"
remote_src: True
remote_src: true
dest: "{{ kpm_install_dir }}"
owner: "{{ kpm_owner }}"
group: "{{ kpm_group }}"
Expand Down Expand Up @@ -116,5 +116,5 @@
path: "{{ kpm_install_dir }}/kpm-{{ kpm_version }}-linux-{{ ansible_architecture }}"
owner: "{{ kpm_owner }}"
group: "{{ kpm_group }}"
recurse: yes
recurse: true
tags: kpm
2 changes: 1 addition & 1 deletion ansible/roles/migrations/tasks/flyway.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
- name: Download killbill-flyway release metadata
ansible.builtin.uri:
url: "{{ nexus_url }}/{{ nexus_repository }}/org/kill-bill/billing/killbill-util/maven-metadata.xml"
return_content: yes
return_content: true
register: migrations_flyway_metadata
when: migrations_flyway_version is undefined
tags: migrations
Expand Down
3 changes: 1 addition & 2 deletions ansible/roles/migrations/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
- "{{ migrations_result['migrations']['killbill'] }}"
- "{{ migrations_result['migrations']['plugins']['java'] }}"
when: item['dir'] is defined
changed_when: False
changed_when: false
register: migrations_java_dry_run_migrations
tags: migrations

Expand All @@ -53,4 +53,3 @@
loop_control:
loop_var: migration
when: migration['dir'] is defined

2 changes: 1 addition & 1 deletion ansible/roles/migrations/tasks/migrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
- name: Run SQL migration
ansible.builtin.command: "{{ flyway }} -locations=filesystem:{{ migration['dir'] }} -table={{ migration['table'] }} -validateOnMigrate=false migrate"
register: migrations_flyway_result
ignore_errors: True
ignore_errors: true
changed_when: false
tags: migrations

Expand Down
2 changes: 0 additions & 2 deletions ansible/roles/plugins/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,3 @@
plugin_key: "{{ plugin_key }}"
local_node_only: "{{ local_node_only | default(false) }}"
tags: plugin-restart


8 changes: 4 additions & 4 deletions ansible/roles/tomcat/tasks/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
name: "{{ tomcat_owner }}"
comment: Kill Bill Tomcat owner
group: "{{ tomcat_group }}"
create_home: yes
create_home: true
home: "{{ tomcat_home }}"
shell: /bin/bash
state: present
Expand All @@ -30,7 +30,7 @@
- name: Download Tomcat release metadata
ansible.builtin.uri:
url: "{{ nexus_url }}/{{ nexus_repository }}/org/apache/tomcat/tomcat/maven-metadata.xml"
return_content: yes
return_content: true
register: tomcat_metadata
when: tomcat_version is undefined
tags: install
Expand All @@ -46,7 +46,7 @@
become: true
ansible.builtin.unarchive:
src: "http://archive.apache.org/dist/tomcat/tomcat-9/v{{ tomcat_version }}/bin/apache-tomcat-{{ tomcat_version }}.tar.gz"
remote_src: True
remote_src: true
dest: "{{ tomcat_install_dir }}"
owner: "{{ tomcat_owner }}"
group: "{{ tomcat_group }}"
Expand All @@ -59,7 +59,7 @@
path: "{{ tomcat_install_dir }}/apache-tomcat-{{ tomcat_version }}"
owner: "{{ tomcat_owner }}"
group: "{{ tomcat_group }}"
recurse: yes
recurse: true
tags: install

- name: Symlink install directory
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/tomcat/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
owner: "{{ tomcat_owner }}"
group: "{{ tomcat_group }}"
# If the files already exist, don't clobber them
force: no
force: false
with_items:
- src: tomcat/conf
name: context.xml
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/tomcat/tasks/native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
dest: "{{ tomcat_workspace.path }}"
extra_opts: [--strip-components=1]
owner: "{{ ansible_user_id }}"
remote_src: yes
remote_src: true
tags: native

- name: Configure native libraries
Expand Down Expand Up @@ -123,7 +123,7 @@
path: "{{ tomcat_native_libdir }}"
owner: "{{ tomcat_owner }}"
group: "{{ tomcat_group }}"
recurse: yes
recurse: true
tags: install

- name: Remove temporary directory
Expand Down
6 changes: 3 additions & 3 deletions ansible/roles/tomcat/tasks/restart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
CATALINA_PID: "{{ catalina_base }}/tomcat.pid"
ansible.builtin.command: "nohup {{ catalina_home }}/bin/catalina.sh start"
args:
chdir: "{{ catalina_base }}"
chdir: "{{ catalina_base }}"
when:
- catalina_home is defined
- not tomcat_foreground
Expand All @@ -24,8 +24,8 @@
CATALINA_PID: "{{ catalina_base }}/tomcat.pid"
ansible.builtin.command: "{{ catalina_home }}/bin/catalina.sh run"
args:
chdir: "{{ catalina_base }}"
chdir: "{{ catalina_base }}"
when:
- catalina_home is defined
- tomcat_foreground
changed_when: false
changed_when: false
2 changes: 1 addition & 1 deletion ansible/tomcat_restart.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
- name: Restart Tomcat
hosts: all
become: yes
become: true
tasks:
- name: Restart Tomcat
import_tasks: roles/tomcat/tasks/restart.yml
2 changes: 1 addition & 1 deletion ansible/tomcat_stop.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
- name: Stop Tomcat
hosts: all
become: yes
become: true
tasks:
- name: Stop Tomcat
import_tasks: roles/tomcat/tasks/stop.yml
9 changes: 4 additions & 5 deletions docker/templates/base/latest/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
FROM ubuntu:20.04 as builder-base
FROM ubuntu:24.04 AS builder-base
LABEL maintainer="killbilling-users@googlegroups.com"

USER root

ENV LC_CTYPE=en_US.UTF-8
ENV LC_ALL=C
ENV LANG=en_US.UTF-8
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8
ENV PYTHONIOENCODING=utf8

# Install convenient utilities
Expand Down Expand Up @@ -102,7 +101,7 @@ RUN ansible-playbook $ANSIBLE_OPTS \
$KILLBILL_CLOUD_ANSIBLE_ROLES/tomcat.yml

# Build Tomcat native libraries
FROM builder-base as builder-tomcat
FROM builder-base AS builder-tomcat
USER $TOMCAT_OWNER
RUN ansible-playbook $ANSIBLE_OPTS \
-e tomcat_install_dir=$TOMCAT_INSTALL_DIR \
Expand Down
2 changes: 1 addition & 1 deletion docker/templates/base/latest/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# killbill/base image

Shared base image with Tomcat, JDK and KPM inside Ubuntu 20.04 LTS. It also contains Ansible and our playbooks from https://github.com/killbill/killbill-cloud.
Shared base image with Tomcat, JDK and KPM inside Ubuntu 24.04 LTS. It also contains Ansible and our playbooks from https://github.com/killbill/killbill-cloud.

To build this docker image:

Expand Down
Loading