Skip to content
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.

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

Bump actions/checkout from 3 to 4 #8

Closed
wants to merge 47 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
0c3a66f
Bump actions/checkout from 3 to 4 (#68)
dependabot[bot] Sep 11, 2023
ca20b76
add reviewers by dependabot (#70)
lauwarm Sep 11, 2023
5090594
Bump docker/build-push-action from 4.1.1 to 4.2.1 (#69)
dependabot[bot] Sep 11, 2023
ad18353
Update dependabot.yml
lauwarm Sep 11, 2023
ff69fce
Update dependabot.yml
lauwarm Sep 11, 2023
50f07ce
update streamlink to version 6.1.0 (#71)
lauwarm Sep 11, 2023
fd9190e
Merge branch 'lauwarm:main' into main
KimPig Sep 21, 2023
eac1e94
Delete personal things
KimPig Sep 21, 2023
942d0c5
Update streamlink to version 6.2.0 (#79)
lauwarm Sep 27, 2023
05f6c87
Bump docker/setup-qemu-action from 2 to 3 (#72)
dependabot[bot] Sep 27, 2023
a17abc1
Bump docker/setup-buildx-action from 2 to 3 (#73)
dependabot[bot] Sep 27, 2023
c144bee
Bump docker/build-push-action from 4.2.1 to 5.0.0 (#74)
dependabot[bot] Sep 27, 2023
29ea5b7
Bump docker/login-action from 2.2.0 to 3.0.0 (#75)
dependabot[bot] Sep 27, 2023
30b065e
Bump docker/metadata-action from 4.6.0 to 5.0.0 (#76)
dependabot[bot] Sep 27, 2023
cf5e69b
update streamlink to version 6.2.1 (#80)
lauwarm Oct 6, 2023
95bcf69
update python to version 3.12.0 (#81)
lauwarm Oct 7, 2023
6b599e5
update streamlink to version 6.3.0 (#83)
lauwarm Oct 28, 2023
b60ca87
Create close-inactive-issue.yml
lauwarm Nov 2, 2023
44d8374
Bump actions/stale from 5 to 8 (#84)
dependabot[bot] Nov 2, 2023
433bc98
update streamlink to version 6.3.0 (#85)
lauwarm Nov 3, 2023
73e1f43
update streamlink to version 6.3.1 (#86)
lauwarm Nov 3, 2023
5431a11
Merge branch 'lauwarm:main' into main
KimPig Nov 17, 2023
57d09be
update streamlink to version 6.4.0 (#88)
lauwarm Nov 27, 2023
32d4d47
Python3.12.0 bullseye 6.4.1 (#89)
lauwarm Nov 27, 2023
2e6affa
Update Dockerfile
lauwarm Nov 27, 2023
0f09ea6
Bump docker/build-push-action from 5.0.0 to 5.1.0 (#87)
dependabot[bot] Nov 27, 2023
b892e4d
update streamlink to version 6.4.2 (#90)
lauwarm Nov 29, 2023
ccb5a8f
Bump docker/metadata-action from 5.0.0 to 5.2.0 (#91)
dependabot[bot] Dec 1, 2023
f63655e
Merge branch 'lauwarm:main' into main
KimPig Dec 7, 2023
598f1f3
Bump docker/metadata-action from 5.2.0 to 5.3.0 (#92)
dependabot[bot] Dec 10, 2023
19b2b6f
Bump actions/stale from 8 to 9 (#93)
dependabot[bot] Dec 10, 2023
7bf5eef
update streamlink to version 6.5.0 (#94)
lauwarm Dec 17, 2023
59a461d
Bump docker/metadata-action from 5.3.0 to 5.4.0 (#95)
dependabot[bot] Dec 18, 2023
9af807b
Merge branch 'lauwarm:main' into main
KimPig Dec 27, 2023
4f79d75
Bump docker/metadata-action from 5.4.0 to 5.5.0 (#96)
dependabot[bot] Jan 11, 2024
a8d2676
update streamlink to version 6.5.1 (#97)
lauwarm Jan 23, 2024
43da620
Merge branch 'lauwarm:main' into main
KimPig Feb 12, 2024
4c3136a
update streamlink to version 6.6.0 (#99)
lauwarm Feb 21, 2024
af7e3ec
update streamlink to version 6.6.1 (#100)
lauwarm Feb 21, 2024
0beaa7b
update streamlink to version 6.6.2 (#101)
lauwarm Feb 21, 2024
954cc88
Bump docker/metadata-action from 5.5.0 to 5.5.1 (#98)
dependabot[bot] Feb 21, 2024
22f6c72
Merge branch 'lauwarm:main' into main
KimPig Feb 26, 2024
a15fb79
Update Dockerfile for test
KimPig Feb 26, 2024
06e0e70
Update streamlink-recorder.sh
KimPig Feb 26, 2024
a0a47d9
Merge pull request #1 from KimPig/test-for-afreeca
KimPig Feb 26, 2024
5fbe759
Update README.md
KimPig Feb 26, 2024
37fb387
Bump actions/checkout from 3 to 4
dependabot[bot] Jul 17, 2024
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
10 changes: 9 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,17 @@ updates:
directory: "/"
schedule:
interval: "daily"
reviewers:
- "lauwarm"
assignees:
- "lauwarm"
- package-ecosystem: "docker"
directory: "/"
registries:
- dockerhub
schedule:
interval: "daily"
interval: "daily"
reviewers:
- "lauwarm"
assignees:
- "lauwarm"
22 changes: 22 additions & 0 deletions .github/workflows/close-inactive-issue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Close inactive issues
on:
schedule:
- cron: "30 1 * * *"

jobs:
close-issues:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v9
with:
days-before-issue-stale: 30
days-before-issue-close: 14
stale-issue-label: "stale"
stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
days-before-pr-stale: -1
days-before-pr-close: -1
repo-token: ${{ secrets.GITHUB_TOKEN }}
24 changes: 12 additions & 12 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,28 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Docker Login
uses: docker/login-action@v2.2.0
uses: docker/login-action@v3.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
with:
images: lauwarm/streamlink-recorder

- name: Build and push Docker image
uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56
with:
context: .
push: true
Expand All @@ -46,28 +46,28 @@ jobs:
if: GitHub.ref == 'refs/heads/main' || GitHub.event_name == 'release'
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Docker Login
uses: docker/login-action@v2.2.0
uses: docker/login-action@v3.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
with:
images: lauwarm/streamlink-recorder

- name: Build and push Docker image
uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56
with:
context: .
push: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Install the cosign tool except on PR
# https://github.com/sigstore/cosign-installer
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/github-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,31 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Setup Docker buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
uses: docker/login-action@v2.2.0
uses: docker/login-action@v3.0.0
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
Expand Down
15 changes: 8 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
FROM python:3.12.0rc1-bullseye
LABEL maintainer="[email protected]"
FROM python:3.12
LABEL maintainer="[email protected]"

ENV streamlinkCommit=1ead72dd1e50afb90a141cc65c0bdbe143fe6f50
#ENV streamlinkVersion=6.0.1
ENV streamlinkCommit=57dacf7bc9ee1f5793f8aa3c715220ded19653f6

#ENV streamlinkVersion=6.4.2
#ENV PATH "${HOME}/.local/bin:${PATH}"

#ADD https://github.com/streamlink/streamlink/releases/download/${streamlinkVersion}/streamlink-${streamlinkVersion}.tar.gz /opt/
Expand All @@ -22,16 +23,16 @@ RUN pip3 install --upgrade git+https://github.com/streamlink/streamlink.git@${st

RUN apt-get update -y && \
apt-get install -y ffmpeg && \
apt-get install -y jq
apt-get install -y jq

RUN echo 'export PATH="${HOME}/.local/bin:${PATH}"'

RUN mkdir /home/download
RUN mkdir /home/script
RUN mkdir /home/plugins

#RUN git clone https://github.com/Damianonymous/streamlink-plugins.git
#RUN cp /streamlink-plugins/*.py /home/plugins/
RUN git clone https://github.com/Damianonymous/streamlink-plugins.git
RUN cp /streamlink-plugins/*.py /home/plugins/

COPY ./streamlink-recorder.sh /home/script/
COPY ./entrypoint.sh /home/script
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ services:
container_name: Streamlink-Recorder
restart: unless-stopped
volumes:
- /volume1/docker/Twitch-recorder/poqrs3077:/home/download
- /urdownloadfolder:/home/download
environment:
- streamName=urtwitchstreamer
- streamLink=twitch.tv/urtwitchstreamer
- streamName=STREAMNAME
- streamLink=STREAMURL
- streamQuality=best
- streamOptions=--twitch-disable-hosting --twitch-disable-ads
- uid=
- gid=
- streamOptions=OPTIONS
- uid=1000
- gid=1000
- TZ=Asia/Seoul
```

Expand All @@ -43,12 +43,12 @@ services:

`streamName` - name for the stream.

`streamOptions` - streamlink flags (--twitch-disable-reruns, separated by space, see [Plugins](https://streamlink.github.io/plugins.html))
`streamOptions` - streamlink flags (--twitch-disable-hosting --twitch-disable-ads, separated by space, see [Plugins](https://streamlink.github.io/plugins.html))

`uid` - USER ID, map to your desired User ID (fallback to 9001)

`gid` - GROUP ID, map to your desired Group ID (fallback to 9001)

The File will be saved as `streamName - Year-Month-Day HourMinuteSecond - streamTitle.mp4`

Also, The File format will be MP4, not TS (depending on ffmpeg)
Also, format will be MP4, not TS (depending on ffmpeg)
2 changes: 1 addition & 1 deletion streamlink-recorder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ while [ true ]; do
# Extract stream title from JSON
streamTitle=$(echo $streamInfo | jq -r '.metadata.title')
# Download and convert stream
streamlink $streamOptions $streamLink $streamQuality -O | ffmpeg -i pipe:0 -c:v copy -c:a copy "/home/download/${streamName} - ${streamDate} - ${streamTitle}.mp4"
streamlink $streamOptions $streamLink $streamQuality -O | ffmpeg -fflags +discardcorrupt -i pipe:0 -c:v copy -c:a copy "/home/download/${streamName} - ${streamDate} - ${streamTitle}.mp4"
sleep 60s
done
Loading