From 05d744cb276ab27511b3a74d7296322282ef96c5 Mon Sep 17 00:00:00 2001 From: Roelf Wichertjes Date: Thu, 24 Feb 2022 23:36:36 +0100 Subject: [PATCH] Remove unneeded patch. --- Dockerfile | 4 ---- config.patch | 21 --------------------- 2 files changed, 25 deletions(-) delete mode 100644 config.patch diff --git a/Dockerfile b/Dockerfile index 5aab934..a7500e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,10 +53,6 @@ USER ab RUN git clone --recursive https://github.com/ArchiveTeam/ArchiveBot.git /home/ab/ArchiveBot WORKDIR /home/ab/ArchiveBot -# Patch a file -COPY config.patch /home/ab/config.patch -RUN patch /home/ab/ArchiveBot/pipeline/archivebot/shared_config.py /home/ab/config.patch - # Setup symlinks for pipeline RUN ln -s /usr/local/bin/wpull /home/ab/ArchiveBot/pipeline/wpull RUN rm /home/ab/ArchiveBot/pipeline/youtube-dl diff --git a/config.patch b/config.patch deleted file mode 100644 index cc42c48..0000000 --- a/config.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- shared_config.py.orig 2022-02-24 20:30:36.509450521 +0100 -+++ shared_config.py 2022-02-24 20:31:13.029431468 +0100 -@@ -1,12 +1,17 @@ - import os - import yaml - -+try: -+ from yaml import CLoader as Loader, CDumper as Dumper -+except ImportError: -+ from yaml import Loader, Dumper -+ - def config(): - my_dir = os.path.dirname(__file__) - config_file = os.path.join(my_dir, '../../lib/shared_config.yml') - - with open(config_file, 'r') as f: -- return yaml.load(f.read()) -+ return yaml.load(f.read(), Loader=Loader) - - def log_channel(): - c = config()