From d3c129be4a91657f441205a2a0c8bfa2401b8ce8 Mon Sep 17 00:00:00 2001 From: Paul Cioanca Date: Fri, 23 Dec 2022 18:01:49 +0100 Subject: [PATCH 1/7] chore: add pgroonga MeCab tokenizer support; build job optimization --- Dockerfile | 3 ++- ansible/tasks/docker/setup.yml | 7 +++++++ ansible/tasks/postgres-extensions/24-pgroonga.yml | 8 ++++++++ common.vars.pkr.hcl | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5855416fd..4ebb436cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,7 @@ RUN apt update && \ RUN --mount=type=bind,source=docker/cache,target=/ccache,rw \ ccache -s && \ + ansible-galaxy collection install community.general && \ cd /tmp/ansible && \ ansible-playbook -e '{"async_mode": false}' playbook-docker.yml && \ apt -y autoremove && \ @@ -24,7 +25,7 @@ RUN --mount=type=bind,source=docker/cache,target=/ccache,rw \ apt install -y default-jdk-headless locales && \ sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \ locale-gen && \ - rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/* + rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/* /usr/lib/python3/dist-packages/ansible_collections/* ENV LANGUAGE en_US.UTF-8 ENV LANG en_US.UTF-8 diff --git a/ansible/tasks/docker/setup.yml b/ansible/tasks/docker/setup.yml index 55686d368..39a1b0afa 100644 --- a/ansible/tasks/docker/setup.yml +++ b/ansible/tasks/docker/setup.yml @@ -38,6 +38,13 @@ - set_fact: platform: "{{ platform_output.stdout }}" +# Find number of processors and set as a variable +- name: determining number of processors + shell: nproc + register: nproc_output +- set_fact: + parallel_jobs: "{{ nproc_output.stdout }}" + - name: Setup - import postgresql.conf template: src: files/postgresql_config/postgresql.conf.j2 diff --git a/ansible/tasks/postgres-extensions/24-pgroonga.yml b/ansible/tasks/postgres-extensions/24-pgroonga.yml index 7088862b4..df54b3ecf 100644 --- a/ansible/tasks/postgres-extensions/24-pgroonga.yml +++ b/ansible/tasks/postgres-extensions/24-pgroonga.yml @@ -1,4 +1,11 @@ # groonga and pgroonga +- name: groonga - download & install dependencies + apt: + pkg: + - libmecab2 + - mecab-naist-jdic + update_cache: yes + install_recommends: no - name: groonga - download groonga get_url: @@ -23,6 +30,7 @@ - name: groonga - build make: chdir: /tmp/groonga-{{ groonga_release }} + jobs: "{{ parallel_jobs | default(omit) }}" become: yes - name: groonga - install diff --git a/common.vars.pkr.hcl b/common.vars.pkr.hcl index 13fb3a4af..48b29dfaa 100644 --- a/common.vars.pkr.hcl +++ b/common.vars.pkr.hcl @@ -1 +1 @@ -postgres-version = "15.1.0.19" +postgres-version = "15.1.0.19-rc-pgroonga" From b1177b125d86225a6d202791d930ff6b992c35f5 Mon Sep 17 00:00:00 2001 From: Paul Cioanca Date: Fri, 23 Dec 2022 19:26:42 +0100 Subject: [PATCH 2/7] chore: bump version --- common.vars.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.vars.pkr.hcl b/common.vars.pkr.hcl index 48b29dfaa..18d4ef5bb 100644 --- a/common.vars.pkr.hcl +++ b/common.vars.pkr.hcl @@ -1 +1 @@ -postgres-version = "15.1.0.19-rc-pgroonga" +postgres-version = "15.1.0.20" From 1ac52173d636e693957d47a28db68830191c4328 Mon Sep 17 00:00:00 2001 From: Paul Cioanca Date: Thu, 5 Jan 2023 19:27:03 +0200 Subject: [PATCH 3/7] chore: add libmecab-dev package --- ansible/tasks/postgres-extensions/24-pgroonga.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/tasks/postgres-extensions/24-pgroonga.yml b/ansible/tasks/postgres-extensions/24-pgroonga.yml index df54b3ecf..8f6202028 100644 --- a/ansible/tasks/postgres-extensions/24-pgroonga.yml +++ b/ansible/tasks/postgres-extensions/24-pgroonga.yml @@ -3,6 +3,7 @@ apt: pkg: - libmecab2 + - libmecab-dev - mecab-naist-jdic update_cache: yes install_recommends: no From d2e682389637ac43969076027cc58dad1131dd6c Mon Sep 17 00:00:00 2001 From: Paul Cioanca Date: Thu, 5 Jan 2023 19:35:08 +0200 Subject: [PATCH 4/7] chore: bump postgres version --- common.vars.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.vars.pkr.hcl b/common.vars.pkr.hcl index 18d4ef5bb..4f5116fcb 100644 --- a/common.vars.pkr.hcl +++ b/common.vars.pkr.hcl @@ -1 +1 @@ -postgres-version = "15.1.0.20" +postgres-version = "15.1.0.21" From 49dea51f3babb2da836f7a0076cd3740f1ac4b8a Mon Sep 17 00:00:00 2001 From: Paul Cioanca Date: Fri, 6 Jan 2023 16:39:34 +0200 Subject: [PATCH 5/7] chore: move groonga packages to PGroonga task file --- ansible/tasks/docker/setup.yml | 7 ------- ansible/tasks/postgres-extensions/24-pgroonga.yml | 7 ++++++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ansible/tasks/docker/setup.yml b/ansible/tasks/docker/setup.yml index 39a1b0afa..97a52f1d8 100644 --- a/ansible/tasks/docker/setup.yml +++ b/ansible/tasks/docker/setup.yml @@ -18,13 +18,6 @@ - cmake - ninja-build - python - - groonga-normalizer-mysql - - zlib1g-dev - - liblzo2-dev - - libmsgpack-dev - - libzmq3-dev - - libevent-dev - - libmecab-dev - systemtap-sdt-dev - ccache - clang diff --git a/ansible/tasks/postgres-extensions/24-pgroonga.yml b/ansible/tasks/postgres-extensions/24-pgroonga.yml index 8f6202028..e679224be 100644 --- a/ansible/tasks/postgres-extensions/24-pgroonga.yml +++ b/ansible/tasks/postgres-extensions/24-pgroonga.yml @@ -2,7 +2,12 @@ - name: groonga - download & install dependencies apt: pkg: - - libmecab2 + - groonga-normalizer-mysql + - zlib1g-dev + - liblzo2-dev + - libmsgpack-dev + - libzmq3-dev + - libevent-dev - libmecab-dev - mecab-naist-jdic update_cache: yes From c264dbfbb64776a3a1a735b737aac3dc8735ebcb Mon Sep 17 00:00:00 2001 From: Paul Cioanca Date: Wed, 11 Jan 2023 13:14:19 +0200 Subject: [PATCH 6/7] chore: remove groonga-normalizer-mysql --- ansible/tasks/postgres-extensions/24-pgroonga.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible/tasks/postgres-extensions/24-pgroonga.yml b/ansible/tasks/postgres-extensions/24-pgroonga.yml index e679224be..18dce5c97 100644 --- a/ansible/tasks/postgres-extensions/24-pgroonga.yml +++ b/ansible/tasks/postgres-extensions/24-pgroonga.yml @@ -2,7 +2,6 @@ - name: groonga - download & install dependencies apt: pkg: - - groonga-normalizer-mysql - zlib1g-dev - liblzo2-dev - libmsgpack-dev From 9f3973a60d187d9a4ae9136d9b1003932d6e4970 Mon Sep 17 00:00:00 2001 From: Paul Cioanca Date: Wed, 11 Jan 2023 13:19:12 +0200 Subject: [PATCH 7/7] chore: bump postgres version --- common.vars.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.vars.pkr.hcl b/common.vars.pkr.hcl index 545c67d9d..de144abf6 100644 --- a/common.vars.pkr.hcl +++ b/common.vars.pkr.hcl @@ -1 +1 @@ -postgres-version = "15.1.0.22" +postgres-version = "15.1.0.23"