Merge branch 'master' into dev

eosswedenorg · Apr 29, 2024 · 79e5777 · 79e5777
2 parents 63da39f + 7ff0066
commit 79e5777
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 /config.yml
 /.pc
 /.vscode/
+/vendor
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ GO=go
 GOLDFLAGS=-v -s -w -X main.VersionString=$(PROGRAM_VERSION)
 GOBUILDFLAGS=-v -p $(shell nproc) -ldflags="$(GOLDFLAGS)"
 PROGRAM=thalos-server
-PROGRAM_VERSION=1.1.0
+PROGRAM_VERSION=1.1.1
 PREFIX=/usr/local
 BINDIR=$(PREFIX)/bin
 CFGDIR=$(PREFIX)/etc/thalos

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,13 @@
+thalos (1.1.1) bionic focal jammy; urgency=medium
+
+  * Build binaries linked with musl libc for alpine linux.
+  * Added docker image.
+  * redis-acl tool: added `--pass-len` flag.
+  * redis-acl tool: fix correct syntax for cleartext passwords.
+  * redis-acl tool: allow ping command for server user.
+
+ -- Henrik Hautakoski <[email protected]>  Tue, 09 Apr 2024 22:40:20 +0200
+
 thalos (1.1.0) bionic focal jammy; urgency=medium
 
   * Adding `ActionTrace.FirstReceiver` flag, that is `true`

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:latest
 LABEL maintainer="Henrik Hautakoski <[email protected]>"
-ARG VERSION=1.1.0
+ARG VERSION=1.1.1
 WORKDIR /thalos
 ADD --chmod=755 https://github.com/eosswedenorg/thalos/releases/download/v$VERSION/thalos-server-${VERSION}-linux-amd64-musl thalos-server
 ENTRYPOINT [ "./thalos-server" ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     /config.yml
     /.pc
     /.vscode/
+    /vendor