.circleci/config.yml

@@ -1,39 +0,0 @@
-version: 2
-jobs:
-  build:
-    environment:
-      REPO_NAME: "wastrachan"
-      IMAGE_NAME: "flexget"
-      IMAGE_VERSION: "3.1.98"
-    docker:
-      - image: docker:latest
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run:
-          name: Install deps
-          command: |
-            apk --no-cache add curl
-      - run:
-          name: Build image
-          command: |
-            docker build --build-arg FLEXGET_VERSION=$IMAGE_VERSION -t $IMAGE_NAME .
-            docker tag $IMAGE_NAME $REPO_NAME/$IMAGE_NAME:$IMAGE_VERSION
-            docker tag $IMAGE_NAME $REPO_NAME/$IMAGE_NAME:latest
-      - deploy:
-          name: Publish image
-          command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
-              docker push $REPO_NAME/$IMAGE_NAME:$IMAGE_VERSION
-              docker push $REPO_NAME/$IMAGE_NAME:latest
-            fi
-
-workflows:
-  version: 2
-  commit:
-    jobs:
-      - build:
-          filters:
-            branches:
-              only: master

Dockerfile

@@ -1,45 +1,33 @@
-FROM python:3.7-alpine
+FROM python:3-alpine
 LABEL maintainer="Winston Astrachan"
 LABEL description="FlexGet on Alpine Linux"
 
-ARG FLEXGET_VERSION="3.1.45"
+ARG FLEXGET_VERSION="2.20.12"
 
-ENV DEPS \
+RUN addgroup -g 101 -S flexget && \
-    libjpeg \
+    adduser -u 100 -S -G flexget flexget
-    zlib
-ENV DEPS_BUILD \
-    gcc \
-    libgcc \
-    jpeg-dev \
-    musl-dev \
-    zlib-dev
 
-RUN \
+RUN mkdir /config && \
-    addgroup -g 101 -S flexget && \
+    mkdir /download
-    adduser -u 100 -S -G flexget flexget && \
-    \
-    mkdir /config && \
-    \
-    apk add --no-cache $DEPS $DEPS_BUILD && \
-    pip install -U setuptools pip packaging
 
 VOLUME /config
-ADD https://github.com/Flexget/Flexget/tarball/v${FLEXGET_VERSION} flexget.tar.gz
+VOLUME /download
 
+COPY overlay/ /
+ADD https://github.com/Flexget/Flexget/tarball/${FLEXGET_VERSION} flexget.tar.gz
 RUN \
+    # Extract and install FlexGet
     mkdir flexget && \
     tar --strip-components=1 -xzvf flexget.tar.gz -C flexget && \
     cd flexget && \
     python3 setup.py install && \
     \
+    # Install python dependencies
     pip install deluge-client && \
-    pip install irc_bot && \
+    pip install transmissionrpc && \
-    pip install qbittorrent-api && \
     \
-    rm -rf /flexget /flexget.tar.gz && \
+    # Clean up build files, deps
-    apk del $DEPS_BUILD
+    rm -rf /flexget /flexget.tar.gz
-
-COPY overlay/ /
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["su", "-p", "-s", "/bin/sh", "flexget", "-c", "/usr/local/bin/flexget -c /config/config.yml --loglevel verbose daemon start --autoreload-config"]

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2020 Winston Astrachan
+Copyright (c) 2019 Winston Astrachan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

Makefile

@@ -1,6 +1,7 @@
 # Docker FlexGet Image
-# Copyright (c) Winston Astrachan 2020
+#
-
+# Winston Astrachan 2019
+#
 help:
 	@echo ""
 	@echo "Usage: make COMMAND"

README.md

@@ -3,8 +3,9 @@ FlexGet Docker Image
 
 FlexGet in a Docker container, with configuration in a volume, and a configurable UID/GID for said files.
 
-[![](https://circleci.com/gh/wastrachan/docker-flexget.svg?style=svg)](https://circleci.com/gh/wastrachan/docker-flexget)
+[![](https://img.shields.io/github/tag/wastrachan/docker-flexget.svg)](https://github.com/wastrachan/docker-flexget/releases)
-[![](https://img.shields.io/docker/pulls/wastrachan/flexget.svg)](https://hub.docker.com/r/wastrachan/flexget)
+[![](https://images.microbadger.com/badges/image/wastrachan/docker-flexget.svg)](https://microbadger.com/images/wastrachan/docker-flexget)
+[![](https://img.shields.io/docker/pulls/wastrachan/docker-flexget.svg)](https://hub.docker.com/r/wastrachan/docker-flexget)
 
 ## Install
 

scripts/update_version.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-CIRCLECI_CONFIG=".circleci/config.yml"
-
-# Read current version from CircleCI config
-current_version=`sed -rn 's/^\s*IMAGE_VERSION: \"([0-9\.]*)\"$/\1/p' $CIRCLECI_CONFIG`
-
-# Prompt user for new version
-echo "The current configured version of FlexGet: $current_version"
-echo "Enter new version:"
-read new_version
-
-# Replace version in CircleCI config
-sed -i -r "s/(^\s*IMAGE_VERSION: \")([0-9\.]*)\"$/\1$new_version\"/g" $CIRCLECI_CONFIG
-
-# Commit version update
-git add $CIRCLECI_CONFIG
-git commit -m "Bump FlexGet to $new_version"