eosswedenorg/thalos
1
0
Fork 0
mirror of https://github.com/eosswedenorg/thalos synced 2026-06-17 04:30:03 +02:00
Code Releases Activity

Compare commits

base: eosswedenorg:master
Branches Tags
eosswedenorg:master
eosswedenorg:dev
eosswedenorg:protobuf
eosswedenorg:redis-stream-wip
eosswedenorg:services
eosswedenorg:redis-streams
eosswedenorg:v1.1.9
eosswedenorg:v1.1.8
eosswedenorg:v1.1.8-rc1
eosswedenorg:v1.1.7
eosswedenorg:v1.1.7-rc2
eosswedenorg:v1.1.7-rc1
eosswedenorg:v1.1.6
eosswedenorg:v1.1.5
eosswedenorg:v1.1.5-rc1
eosswedenorg:v1.1.4
eosswedenorg:v1.1.3
eosswedenorg:v1.1.2
eosswedenorg:v1.1.2-rc4
eosswedenorg:v1.1.2-rc3
eosswedenorg:v1.1.2-rc2
eosswedenorg:v1.1.2-rc1
eosswedenorg:v1.1.1
eosswedenorg:v1.1.0
eosswedenorg:v1.1.0-rc2
eosswedenorg:v1.1.0-rc1
eosswedenorg:api/v1.0.0
eosswedenorg:v1.0.0
eosswedenorg:v0.3.1
eosswedenorg:api/v0.3.0
eosswedenorg:v0.3.0
eosswedenorg:v0.2.2
eosswedenorg:api/v0.2.1
eosswedenorg:v0.2.1
eosswedenorg:api/v0.2.0
eosswedenorg:v0.2.0
eosswedenorg:v0.1.2
eosswedenorg:api/v0.1.2
eosswedenorg:api/v0.1.1
eosswedenorg:v0.1.1
eosswedenorg:v0.1.0
eosswedenorg:api/v0.1.0
..
compare: eosswedenorg:v1.1.8
Branches Tags
eosswedenorg:dev
eosswedenorg:master
eosswedenorg:protobuf
eosswedenorg:redis-stream-wip
eosswedenorg:services
eosswedenorg:redis-streams
eosswedenorg:v1.1.9
eosswedenorg:v1.1.8
eosswedenorg:v1.1.8-rc1
eosswedenorg:v1.1.7
eosswedenorg:v1.1.7-rc2
eosswedenorg:v1.1.7-rc1
eosswedenorg:v1.1.6
eosswedenorg:v1.1.5
eosswedenorg:v1.1.5-rc1
eosswedenorg:v1.1.4
eosswedenorg:v1.1.3
eosswedenorg:v1.1.2
eosswedenorg:v1.1.2-rc4
eosswedenorg:v1.1.2-rc3
eosswedenorg:v1.1.2-rc2
eosswedenorg:v1.1.2-rc1
eosswedenorg:v1.1.1
eosswedenorg:v1.1.0
eosswedenorg:v1.1.0-rc2
eosswedenorg:v1.1.0-rc1
eosswedenorg:api/v1.0.0
eosswedenorg:v1.0.0
eosswedenorg:v0.3.1
eosswedenorg:api/v0.3.0
eosswedenorg:v0.3.0
eosswedenorg:v0.2.2
eosswedenorg:api/v0.2.1
eosswedenorg:v0.2.1
eosswedenorg:api/v0.2.0
eosswedenorg:v0.2.0
eosswedenorg:v0.1.2
eosswedenorg:api/v0.1.2
eosswedenorg:api/v0.1.1
eosswedenorg:v0.1.1
eosswedenorg:v0.1.0
eosswedenorg:api/v0.1.0

No commits in common. "master" and "v1.1.8" have entirely different histories.
master ... v1.1.8

5 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -3,7 +3,7 @@ GO=go
GOLDFLAGS=-v -s -w -X main.VersionString=$(PROGRAM_VERSION) GOLDFLAGS=-v -s -w -X main.VersionString=$(PROGRAM_VERSION)
GOBUILDFLAGS+=-v -p $(shell nproc) -ldflags="$(GOLDFLAGS)" GOBUILDFLAGS+=-v -p $(shell nproc) -ldflags="$(GOLDFLAGS)"
PROGRAM=thalos-server PROGRAM=thalos-server
PROGRAM_VERSION ?= 1.1.9 PROGRAM_VERSION ?= 1.1.8
PREFIX=/usr/local PREFIX=/usr/local
BINDIR=$(PREFIX)/bin BINDIR=$(PREFIX)/bin
CFGDIR=$(PREFIX)/etc/thalos CFGDIR=$(PREFIX)/etc/thalos

6
debian/changelog vendored
View file

@ -1,9 +1,3 @@
thalos (1.1.9) bionic focal jammy; urgency=medium
* [Security CVE-2024-45338] Update golang.org/x/net to 0.33.0
-- Henrik Hautakoski <henrik.hautakoski@gmail.com> Thu, 23 Jan 2025 19:30:31 +0100
thalos (1.1.8) bionic focal jammy; urgency=medium thalos (1.1.8) bionic focal jammy; urgency=medium
* Support for wildcard contracts in Blacklist * Support for wildcard contracts in Blacklist

2
docker/Dockerfile
View file

@ -1,6 +1,6 @@
FROM alpine:latest FROM alpine:latest
LABEL maintainer="Henrik Hautakoski <henrik.Hautakoski@gmail.com>" LABEL maintainer="Henrik Hautakoski <henrik.Hautakoski@gmail.com>"
ARG VERSION=1.1.9 ARG VERSION=1.1.8
WORKDIR /thalos WORKDIR /thalos
ADD --chmod=755 https://github.com/eosswedenorg/thalos/releases/download/v$VERSION/thalos-server-${VERSION}-linux-amd64-musl thalos-server ADD --chmod=755 https://github.com/eosswedenorg/thalos/releases/download/v$VERSION/thalos-server-${VERSION}-linux-amd64-musl thalos-server
ENTRYPOINT [ "./thalos-server" ] ENTRYPOINT [ "./thalos-server" ]

2
go.mod
View file

@ -70,7 +70,7 @@ require (
golang.org/x/crypto v0.31.0 // indirect golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e // indirect golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e // indirect
golang.org/x/mod v0.22.0 // indirect golang.org/x/mod v0.22.0 // indirect
golang.org/x/net v0.33.0 // indirect golang.org/x/net v0.32.0 // indirect
golang.org/x/sync v0.10.0 // indirect golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect golang.org/x/text v0.21.0 // indirect

4
go.sum
View file

@ -260,8 +260,8 @@ golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=