Skip to content

Commit

Permalink
Merge pull request #30
Browse files Browse the repository at this point in the history
merge fix-2ea6447 with master
  • Loading branch information
ksssomesh12 authored Dec 9, 2021
2 parents 2ea6447 + 2b337fa commit bbf6f07
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ FROM ubuntu:latest as base
ENV DEBIAN_FRONTEND='noninteractive'
RUN apt-get update && apt-get upgrade -y && \
apt-get install -y aria2 curl ffmpeg jq libc++-dev locales nano pv python3 python3-pip python3-lxml tzdata && \
apt-get clean && rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/*
RUN locale-gen en_US.UTF-8

FROM ubuntu:latest as api
ENV DEBIAN_FRONTEND='noninteractive'
RUN apt-get update && apt-get upgrade -y && \
apt-get install -y git gperf make cmake clang-10 libc++-dev libc++abi-dev libssl-dev zlib1g-dev && \
apt-get clean && rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/*
WORKDIR /root
RUN git clone --recursive https://github.com/tdlib/telegram-bot-api.git && cd telegram-bot-api && \
git checkout e9587a0 && mkdir build && cd build && \
git checkout e9587a0 && git submodule update && mkdir build && cd build && \
CXXFLAGS="-stdlib=libc++" CC=/usr/bin/clang-10 CXX=/usr/bin/clang++-10 \
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=.. .. && \
cmake --build . --target install -- -j $(nproc) && cd .. && \
Expand All @@ -24,7 +24,7 @@ RUN apt-get update && apt-get upgrade -y && \
apt-get install -y autoconf automake gcc g++ git libtool make python3 python3-dev python3-distutils python3-pip && \
apt-get install -y libc-ares-dev libcrypto++-dev libcurl4-openssl-dev libfreeimage-dev libsodium-dev && \
apt-get install -y libsqlite3-dev libssl-dev swig zlib1g-dev && \
apt-get clean && rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/*
WORKDIR /root
RUN git clone https://github.com/meganz/sdk.git mega-sdk/ && cd mega-sdk/ && \
git checkout v3.9.10 && \
Expand All @@ -49,7 +49,7 @@ RUN apt-get update && apt-get upgrade -y && \
apt-get install -y qbittorrent-nox && \
apt-get purge -y software-properties-common && \
apt-get autoremove -y && \
apt-get clean && rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/*
RUN pip3 install --no-cache-dir /root/mega-sdk/bindings/python/dist/megasdk-*.whl
WORKDIR /usr/src/app
RUN chmod 777 /usr/src/app
Expand Down
1 change: 0 additions & 1 deletion tgmb/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
# TODO: code for direct link generation
# TODO: add hard-restart (restart all subprocesses)
# TODO: decide between confDefaults and optVals for AriaHelper, QbitTorrentHelper
# TODO: remove redundant 'apt-get clean' in Dockerfile
import aria2p
import asyncio
import googleapiclient.discovery
Expand Down

0 comments on commit bbf6f07

Please sign in to comment.