Merge branch 'main' into dependabot/github_actions/docker/login-action-3

.github/workflows/build.yaml

@@ -70,16 +70,13 @@ jobs:
 
       - name: Build binaries
         run: |
-          go build \
-            -o "./${CI_CATALYST_BIN_DIR}/livepeer-log" \
-            -ldflags="-X 'main.Version=${{ github.ref_type == 'tag' && github.ref_name || github.event.pull_request.head.sha || github.sha }}'" \
-            cmd/livepeer-log/livepeer-log.go
-
           go build \
             -o "./${CI_CATALYST_BIN_DIR}/livepeer-catalyst" \
             -ldflags="-X 'main.Version=${{ github.ref_type == 'tag' && github.ref_name || github.event.pull_request.head.sha || github.sha }}'" \
             cmd/catalyst/catalyst.go
 
+          cp ./scripts/livepeer-vmagent ./bin/livepeer-vmagent
+
       - name: Strip binaries of debug symbols
         if: matrix.platform.name == 'linux' && matrix.architecture == 'amd64'
         run: |

Dockerfile

@@ -18,7 +18,7 @@ ADD	.	.
 ARG	GIT_VERSION
 ENV	GIT_VERSION="${GIT_VERSION}"
 
-RUN	make livepeer-log catalyst
+RUN	make catalyst
 
 FROM	ubuntu:22.04	as	catalyst-full-build
 
@@ -70,6 +70,8 @@ RUN	apt update && apt install -yqq \
 	"$(if [ "$BUILD_TARGET" != "stripped" ]; then echo "gdb"; fi)" \
 	&& rm -rf /var/lib/apt/lists/*
 
+# Most of ./scripts is for livepeer-in-a-box except livepeer-vmagent, which is used in production in Catalyst proper
+ADD ./scripts/livepeer-vmagent /usr/local/bin
 COPY --from=catalyst-build	/opt/bin/		/usr/local/bin/
 COPY --from=node-build		/app/go-tools/w3	/opt/local/lib/livepeer-w3
 RUN	ln -s /opt/local/lib/livepeer-w3/livepeer-w3.js /usr/local/bin/livepeer-w3 && \

Makefile

@@ -27,15 +27,15 @@ $(shell mkdir -p $(HOME)/.config/livepeer)
 buildpath=$(realpath ./build)
 
 .PHONY: all
-all: download catalyst livepeer-log
+all: download catalyst
 
 .PHONY: ffmpeg
 ffmpeg:
 	mkdir -p build
 	cd ../go-livepeer && ./install_ffmpeg.sh $(buildpath)
 
 .PHONY: mistserver
-mistserver: build/sysroot-aarch64-gnu-linux
+mistserver:
 	set -x \
 	&& mkdir -p ./build/mistserver \
 	&& cd ./build/mistserver \
@@ -142,11 +142,6 @@ dev:
 	&& stat $(HOME)/.config/livepeer/catalyst.json || cp ./config/catalyst-dev.json $(HOME)/.config/livepeer/catalyst.json \
 	&& ./bin/MistController -c $(HOME)/.config/livepeer/catalyst.json
 
-.PHONY: livepeer-log
-livepeer-log:
-	go build -o ./bin/livepeer-log ./cmd/livepeer-log/livepeer-log.go \
-	&& $(MAKE) box-kill BIN=livepeer-log
-
 .PHONY: clean
 clean:
 	git clean -ffdx && mkdir -p bin build
@@ -179,7 +174,7 @@ docker:
 		.
 
 .PHONY: docker-local
-docker-local: downloader livepeer-log scripts 
+docker-local: downloader scripts 
 	tar ch ./bin ./config \
 	| docker buildx build \
 		--load \

README.md

@@ -51,7 +51,6 @@ in `manifest.yaml` (section below covers its structure).
 
 Run the following commands from the root of this repository directory:
 
-    go build -o ./bin/livepeer-log ./cmd/livepeer-log/livepeer-log.go
     go run cmd/downloader/downloader.go
 
     # or, single command:
@@ -71,7 +70,6 @@ listed below (but not limited to):
 
 -   [go-livepeer]
 -   [MistServer]
--   [Catalyst] (for `livepeer-log`)
 -   [catalyst-api]
 -   [victoria-metrics] (recommended to just download a stable binary
     from github releases)
@@ -101,7 +99,6 @@ be symlinked instead).
 ```sh
 make mistserver
 make go-livepeer
-make livepeer-log
 ```
 
 ## Running Catalyst

go.mod

@@ -11,7 +11,6 @@ require (
 	github.com/peterbourgon/ff/v3 v3.3.1
 	github.com/stretchr/testify v1.8.4
 	github.com/testcontainers/testcontainers-go v0.20.1-0.20230510111141-38b35a314fe4
-	golang.org/x/sync v0.3.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -115,6 +114,7 @@ require (
 	golang.org/x/mod v0.10.0 // indirect
 	golang.org/x/net v0.11.0 // indirect
 	golang.org/x/oauth2 v0.9.0 // indirect
+	golang.org/x/sync v0.3.0 // indirect
 	golang.org/x/tools v0.9.1 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/api v0.129.0 // indirect
@@ -132,7 +132,7 @@ require (
 require (
 	github.com/ProtonMail/go-crypto v0.0.0-20220822140716-1678d6eb0cbe // indirect
 	github.com/ProtonMail/go-mime v0.0.0-20220302105931-303f85f7fe0f // indirect
-	github.com/livepeer/livepeer-data v0.7.3
+	github.com/livepeer/livepeer-data v0.7.3 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/sirupsen/logrus v1.9.2 // indirect
 	golang.org/x/crypto v0.10.0 // indirect