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.

Sign up for GitHub

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

Jump to bottom

Merge master and build images with linuxserver/ffmpeg support #51

Merged
merged 10 commits into from
Aug 12, 2023
Merged

Merge master and build images with linuxserver/ffmpeg support #51

merged 10 commits into from
Aug 12, 2023

Conversation

lizardfish0
Copy link
Contributor

@lizardfish0 lizardfish0 commented Aug 10, 2023 •
edited
Loading

See #50 for most of the changes, but this version will also:

  • Combine build functionality into the main branch.
  • Cleanup and conslidate Dockerfile/s6 run file. I think it makes most sense to do package setup (apt/apk installs) and git operations in the Dockerfile. Then, the s6 run file handles all the SMA-specific business logic of setting up the python venv and installing python packages.

This setup makes using build args a little more straightforward. You can now do the following:

Basic setup.

services:
  sonarr:
    image: mdhiggins/sonarr-sma
    container_name: sonarr
    restart: unless-stopped
    volumes:
      - ../volumes/data/sonarr:/config
      - ../volumes/config:/usr/local/sma/config

Results in linuxserver/sonarr:latest with linuxserver/ffmpeg:latest.

Build from a specific sonarr image (you need to make sure sonarr/ffmpeg OS is compatible, but that's already the case).

services:
  sonarr:
    image: mdhiggins/sonarr-sma
    build:
      context: mdhiggins/sonarr-sma
      args:
        sonarr_tag: 3.0.9
    container_name: sonarr
    restart: unless-stopped
    volumes:
      - ../volumes/data/sonarr:/config
      - ../volumes/config:/usr/local/sma/config

Same but now you have v3.0.9.

Use jrottenberg (same warning as above).

services:
  sonarr:
    image: mdhiggins/sonarr-sma
    build:
      context: mdhiggins/sonarr-sma
      args:
        ffmpeg_source: jrottenberg/ffmpeg
        ffmpeg_tag: 5.1-nvidia
    container_name: sonarr
    restart: unless-stopped
    volumes:
      - ../volumes/data/sonarr:/config
      - ../volumes/config:/usr/local/sma/config

Override with static ffmpeg.

services:
  sonarr:
    image: mdhiggins/sonarr-sma:latest
    container_name: sonarr
    restart: unless-stopped
    environment:
      SMA_FFMPEG_URL: https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz
    volumes:
      - ../volumes/data/sonarr:/config
      - ../volumes/config:/usr/local/sma/config

@lizardfish0 lizardfish0 mentioned this pull request Aug 10, 2023
Closed
@lizardfish0 lizardfish0 marked this pull request as ready for review August 10, 2023 22:04
@mdhiggins mdhiggins merged commit c236387 into mdhiggins:master Aug 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lizardfish0 @mdhiggins