From 80d4215ecdf0d0bbe27f133183b96314fc6a76c6 Mon Sep 17 00:00:00 2001 From: Ian Bodrievskii Date: Tue, 6 Aug 2024 11:39:28 +0200 Subject: [PATCH 1/3] try easy way --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index cca74d7..b442c8b 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -7,7 +7,7 @@ on: env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} - RIAK_VERSION: 3.0.12 + RIAK_VERSION: 3.0.16 jobs: From e73ce21b62287ac8b74767559b48bba84d464014 Mon Sep 17 00:00:00 2001 From: Ian Bodrievskii Date: Tue, 6 Aug 2024 11:53:28 +0200 Subject: [PATCH 2/3] fix patch --- files/rebar.config.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/files/rebar.config.patch b/files/rebar.config.patch index 5a8b45b..d7461b9 100644 --- a/files/rebar.config.patch +++ b/files/rebar.config.patch @@ -1,14 +1,14 @@ --- rebar.config.orig 2023-03-01 15:38:23.497209722 +0400 +++ rebar.config 2023-03-01 15:42:59.569322130 +0400 @@ -17,7 +17,8 @@ - + % {yokozuna, {git, "https://github.com/basho/yokozuna.git", {branch, "develop-3.0"}}}, - -- {riak_repl, {git, "https://github.com/basho/riak_repl.git", {tag, "riak_kv-3.0.12"}}} -+ {riak_repl, {git, "https://github.com/basho/riak_repl.git", {tag, "riak_kv-3.0.12"}}}, + +- {riak_repl, {git, "https://github.com/basho/riak_repl.git", {tag, "riak_kv-3.0.16"}}} ++ {riak_repl, {git, "https://github.com/basho/riak_repl.git", {tag, "riak_kv-3.0.16"}}}, + {lager_logstash_formatter, ".*", {git, "https://github.com/rbkmoney/lager_logstash_formatter.git", {branch, "riak-2.9"}}} ]}. - + {project_plugins, [ @@ -51,6 +52,7 @@ stdlib, From 4dddf144e1feacffa37c9008e8663d9f3fd5605f Mon Sep 17 00:00:00 2001 From: Ian Bodrievskii Date: Tue, 6 Aug 2024 12:01:15 +0200 Subject: [PATCH 3/3] erts change --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4ff65ce..b09a38f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends apt-utils \ curl apt-transport-https ca-certificates git \ - locales sudo patch make wget cmake g++ build-essential libpam0g-dev + locales sudo patch make wget cmake g++ build-essential libpam0g-dev ARG RIAK_VERSION @@ -26,14 +26,14 @@ FROM erlang:22-slim # Create riak user/group RUN adduser --uid 102 --gecos riak --disabled-password --home /var/lib/riak riak && \ mkdir -p /var/log/riak && \ - chown -R 102:102 /var/log/riak + chown -R 102:102 /var/log/riak # Copy riak sources COPY --chown=102:102 --from=build /tmp/portage-root/ / COPY --from=build /opt/riak/_build/deb/rel/riak/lib /usr/lib/riak/lib COPY --from=build /opt/riak/_build/deb/rel/riak/share /usr/lib/riak/share COPY --from=build /opt/riak/_build/deb/rel/riak/releases /usr/lib/riak/releases -COPY --from=build /opt/riak/_build/deb/rel/riak/erts-10.7.2.18 /usr/lib/riak/erts-10.7.2.18 +COPY --from=build /opt/riak/_build/deb/rel/riak/erts-10.7.2.19 /usr/lib/riak/erts-10.7.2.19 COPY --from=build /opt/riak/_build/deb/rel/riak/bin /usr/lib/riak/bin COPY --chown=102:102 --from=build /opt/riak/_build/deb/rel/riak/etc/* /etc/riak/ COPY --chown=102:102 --from=build /opt/riak/_build/deb/rel/riak/data/* /var/lib/riak/data/