Skip to content

Fix/rpm deb packaging #7445

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
Orlando-Richards wants to merge 2 commits into
base: master
Choose a base branch
from
+9 −7
Open

Fix/rpm deb packaging #7445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4858a5e
Remove ruby-etc from fpm build - it is no longer a separate package
Orlando-Richards Apr 22, 2026
49c861e
Fix RPM and deb packaging: correct install paths and protect config f…
Orlando-Richards Apr 22, 2026
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
* [BUGFIX] KV store: Fix false-positive `status_code="500"` metrics for HA tracker CAS operations when using memberlist. #7408
* [BUGFIX] Memberlist: Skip nil values delivered by `WatchPrefix` when a key is deleted, preventing a panic in the HA tracker caused by a failed type assertion on a nil interface value. #7429
* [BUGFIX] Tenant Federation: Fix `unsupported character` error when `tenant-federation.regex-matcher-enabled` is enabled and the input regex matches 0 or 1 existing tenant. #7424
* [BUGFIX] Packaging: Fix RPM and deb packages to install the binary to `/usr/bin`, install the systemd unit to the correct system path (`/usr/lib/systemd/system` for RPM, `/lib/systemd/system` for deb), and mark the sysconfig/default env file as a config file so it is not overwritten on upgrade.

## 1.21.0 in progress

Expand Down
10 changes: 6 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,20 +362,22 @@ dist/$(UPTODATE)-packages: dist $(wildcard packaging/deb/**) $(wildcard packagin
--architecture $$deb_arch \
--after-install packaging/deb/control/postinst \
--before-remove packaging/deb/control/prerm \
--config-files /etc/default/cortex \
--package dist/cortex-$(VERSION)_$$arch.deb \
dist/cortex-linux-$$arch=/usr/local/bin/cortex \
dist/cortex-linux-$$arch=/usr/bin/cortex \
docs/configuration/single-process-config-blocks.yaml=/etc/cortex/single-process-config.yaml \
packaging/deb/default/cortex=/etc/default/cortex \
packaging/deb/systemd/cortex.service=/etc/systemd/system/cortex.service; \
packaging/deb/systemd/cortex.service=/lib/systemd/system/cortex.service; \
$(FPM_OPTS) -t rpm \
--architecture $$rpm_arch \
--after-install packaging/rpm/control/post \
--before-remove packaging/rpm/control/preun \
--config-files /etc/sysconfig/cortex \
--package dist/cortex-$(VERSION)_$$arch.rpm \
dist/cortex-linux-$$arch=/usr/local/bin/cortex \
dist/cortex-linux-$$arch=/usr/bin/cortex \
docs/configuration/single-process-config-blocks.yaml=/etc/cortex/single-process-config.yaml \
packaging/rpm/sysconfig/cortex=/etc/sysconfig/cortex \
packaging/rpm/systemd/cortex.service=/etc/systemd/system/cortex.service; \
packaging/rpm/systemd/cortex.service=/usr/lib/systemd/system/cortex.service; \
done
for pkg in dist/*.deb dist/*.rpm; do \
sha256sum $$pkg | cut -d ' ' -f 1 > $${pkg}-sha-256; \
Expand Down
2 changes: 1 addition & 1 deletion packaging/deb/systemd/cortex.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ After=network-online.target
Restart=always
User=cortex
EnvironmentFile=/etc/default/cortex
ExecStart=/usr/local/bin/cortex --config.file $CONFIG_FILE --log.level $LOG_LEVEL $CUSTOM_ARGS
ExecStart=/usr/bin/cortex --config.file $CONFIG_FILE --log.level $LOG_LEVEL $CUSTOM_ARGS
ExecReload=/bin/kill -HUP $MAINPID
TimeoutStopSec=20s
SendSIGKILL=no
Expand Down
1 change: 0 additions & 1 deletion packaging/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ FROM alpine:3.23
RUN apk add --no-cache \
ruby \
ruby-dev \
ruby-etc \
gcc \
git \
libc-dev \
Expand Down
2 changes: 1 addition & 1 deletion packaging/rpm/systemd/cortex.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ After=network-online.target
Restart=always
User=cortex
EnvironmentFile=/etc/sysconfig/cortex
ExecStart=/usr/local/bin/cortex --config.file $CONFIG_FILE --log.level $LOG_LEVEL $CUSTOM_ARGS
ExecStart=/usr/bin/cortex --config.file $CONFIG_FILE --log.level $LOG_LEVEL $CUSTOM_ARGS
ExecReload=/bin/kill -HUP $MAINPID
TimeoutStopSec=20s
SendSIGKILL=no
Expand Down