diff --git a/Makefile b/Makefile index e1a0f87b..62ff00c5 100644 --- a/Makefile +++ b/Makefile @@ -9,13 +9,11 @@ help: @echo "" @echo "available actions:" @echo "" - @echo " mod-tidy run go mod tidy" @echo " format format source files" @echo " test run tests" @echo " test-32 run tests on a 32-bit system" @echo " test-e2e run end-to-end tests" @echo " lint run linters" - @echo " run run app" @echo " apidocs generate api docs HTML" @echo " binaries build binaries for all platforms" @echo " dockerhub build and push images to Docker Hub" diff --git a/scripts/mod-tidy.mk b/scripts/mod-tidy.mk deleted file mode 100644 index 7a336fc4..00000000 --- a/scripts/mod-tidy.mk +++ /dev/null @@ -1,3 +0,0 @@ -mod-tidy: - docker run --rm -it -v "$(shell pwd):/s" -w /s $(BASE_IMAGE) \ - sh -c "apk add git && GOPROXY=direct go mod tidy" diff --git a/scripts/run.mk b/scripts/run.mk deleted file mode 100644 index 45f01356..00000000 --- a/scripts/run.mk +++ /dev/null @@ -1,48 +0,0 @@ -define DOCKERFILE_RUN -FROM $(BASE_IMAGE) -RUN apk add --no-cache ffmpeg -WORKDIR /s -COPY go.mod go.sum ./ -RUN go mod download -COPY . ./ -RUN go generate ./... -RUN go build -o /out . -WORKDIR / -ARG CONFIG_RUN -RUN echo "$$CONFIG_RUN" > mediamtx.yml -endef -export DOCKERFILE_RUN - -define CONFIG_RUN -#rtspAddress: :8555 -#rtpAddress: :8002 -#rtcpAddress: :8003 -#metrics: yes -#pprof: yes - -paths: - all: -# runOnReady: ffmpeg -i rtsp://localhost:$$RTSP_PORT/$$MTX_PATH -c copy -f mpegts myfile_$$MTX_PATH.ts -# readUser: test -# readPass: tast -# runOnDemand: ffmpeg -re -stream_loop -1 -i testimages/ffmpeg/emptyvideo.mkv -c copy -f rtsp rtsp://localhost:$$RTSP_PORT/$$MTX_PATH - -# proxied: -# source: rtsp://192.168.2.198:554/stream -# rtspTransport: tcp -# sourceOnDemand: yes -# runOnDemand: ffmpeg -i rtsp://192.168.2.198:554/stream -c copy -f rtsp rtsp://localhost:$$RTSP_PORT/proxied2 - -# original: -# runOnReady: ffmpeg -i rtsp://localhost:554/original -b:a 64k -c:v libx264 -preset ultrafast -b:v 500k -max_muxing_queue_size 1024 -f rtsp rtsp://localhost:8554/compressed - -endef -export CONFIG_RUN - -run: - echo "$$DOCKERFILE_RUN" | docker build -q . -f - -t temp \ - --build-arg CONFIG_RUN="$$CONFIG_RUN" - docker run --rm -it \ - --network=host \ - temp \ - sh -c "/out"