Skip to content

riak 3.0.16 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
azowarg wants to merge 3 commits into
base: master
Choose a base branch
from
Open

riak 3.0.16 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80d4215
try easy way
Aug 6, 2024
e73ce21
fix patch
Aug 6, 2024
4dddf14
erts change
Aug 6, 2024
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 .github/workflows/docker-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
RIAK_VERSION: 3.0.12
RIAK_VERSION: 3.0.16


jobs:
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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/
Expand Down
10 changes: 5 additions & 5 deletions files/rebar.config.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down