Compare commits

..

5 Commits
1.4 ... release

Author SHA1 Message Date
13a1f6f32a updating to new file 2017-11-30 20:32:13 -06:00
2893ca1dcb adding build.sh 2017-11-30 19:59:30 -06:00
9e8620cd3c adding build.sh 2017-11-30 19:53:10 -06:00
Matt Burchett
7df377f507 Nadeko Fixes 2017-11-30 19:42:36 -06:00
Matt Burchett
ffef749ea6 Nadeko Release Branch 2017-11-30 19:33:01 -06:00
5 changed files with 64 additions and 35 deletions

View File

@ -1,27 +0,0 @@
FROM phusion/baseimage:latest
WORKDIR /opt/
#Install Dotnet
RUN sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ xenial main" > /etc/apt/sources.list.d/dotnetdev.list' \
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893 \
&& apt-get update && apt-get install -y dotnet-dev-1.0.4
#Add ffmpeg3 ppa
RUN add-apt-repository ppa:jonathonf/ffmpeg-3
#Install required software
RUN apt-get update && apt-get install -y git libopus0 opus-tools libopus-dev libsodium-dev ffmpeg rsync python tzdata
#Add youtube-dl
RUN curl -L https://yt-dl.org/downloads/latest/youtube-dl -o /usr/local/bin/youtube-dl && chmod a+rx /usr/local/bin/youtube-dl
#Download and install stable version of Nadeko
RUN curl -O https://raw.githubusercontent.com/mattburchett/nadeko/1.4/nadeko_installer_1_4.sh && chmod 755 nadeko_installer_1_4.sh && ./nadeko_installer_1_4.sh \
&& curl -O https://raw.githubusercontent.com/mattburchett/nadeko/1.4/nadeko_autorestart.sh && chmod 755 nadeko_autorestart.sh
VOLUME ["/root/nadeko"]
CMD ["sh","/opt/nadeko_autorestart.sh"]

46
Dockerfile Normal file
View File

@ -0,0 +1,46 @@
# Download Ubuntu base image from phusion
# https://github.com/phusion/baseimage-docker
FROM phusion/baseimage:latest
# Define working directory
WORKDIR /opt/
# Prepare for Basic stuff
RUN apt-get update
RUN apt-get install software-properties-common apt-transport-https curl -y
# Register the trusted Microsoft signature key
RUN curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg
RUN mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
# Register the Microsoft Product feed for your distro version
RUN sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-xenial-prod xenial main" > /etc/apt/sources.list.d/dotnetdev.list'
# Add ffmpeg3 ppa
RUN add-apt-repository ppa:jonathonf/ffmpeg-3
# Updating existing tools
RUN apt-get update && apt-get upgrade -y && apt-get dist-upgrade -y
# Install Git
RUN apt-get update && apt-get install -y git
# Install .Net Core
RUN apt-get update && apt-get install -y dotnet-sdk-2.0.0
# Install Redis-server
RUN apt-get update && apt-get install -y redis-server
# Install required software
RUN apt-get update && apt-get install -y libopus0 opus-tools libopus-dev libsodium-dev ffmpeg rsync python python3-pip
#Add youtube-dl
RUN curl -L https://yt-dl.org/downloads/latest/youtube-dl -o /usr/local/bin/youtube-dl && chmod a+rx /usr/local/bin/youtube-dl
#Download and install stable version of Nadeko
RUN curl -H "Cache-Control: no-cache" https://raw.githubusercontent.com/willysunny/Nadecker/master/nadeko_installer_2_5_7.sh -o ./nadeko_installer.sh && chmod 755 nadeko_installer.sh && ./nadeko_installer.sh
RUN curl -O -H "Cache-Control: no-cache" https://raw.githubusercontent.com/willysunny/Nadecker/master/nadeko_autorestart.sh && chmod 755 nadeko_autorestart.sh
VOLUME ["/root/nadeko"]
CMD ["sh","/opt/nadeko_autorestart.sh"]

7
build.sh Executable file
View File

@ -0,0 +1,7 @@
#!/bin/bash
if [ -z "$1" ]; then
echo "You need to specify a version."
exit
else
docker build -t mattburchett/nadeko-$1 .
fi

View File

@ -14,16 +14,18 @@ mv -n /opt/NadekoBot/src/NadekoBot/credentials.json /root/nadeko/credentials.jso
rm /opt/NadekoBot/src/NadekoBot/credentials.json > /dev/null 2>&1
ln -s /root/nadeko/credentials.json /opt/NadekoBot/src/NadekoBot/credentials.json > /dev/null 2>&1
#echo ""
#echo "Linking Nadeko Data Folder"
#mkdir -p /root/nadeko/data
#rsync --ignore-existing -rt /opt/NadekoBot/src/NadekoBot/bin/Release/netcoreapp1.1/data/ /root/nadeko/data/
#rm -rf /opt/NadekoBot/src/NadekoBot/bin/Release/netcoreapp1.1/data/ > /dev/null 2>&1
#ln -s /root/nadeko/data/ /opt/NadekoBot/src/NadekoBot/bin/Release/netcoreapp1.1/data > /dev/null 2>&1
echo ""
echo "Patching Nadeko Data Folder"
mkdir -p /root/nadeko/patch
cd /root/nadeko/patch && bash "./patch.sh"
echo ""
echo "Starting Redis-Server"
/usr/bin/redis-server --daemonize yes
echo ""
echo "Running NadekoBot with auto restart Please wait."
cd NadekoBot/src/NadekoBot
cd /opt/NadekoBot/src/NadekoBot
while :; do dotnet run -c Release; sleep 5s; done
echo "Done"

View File

@ -29,7 +29,7 @@ cd "$root"
echo ""
echo "Downloading NadekoBot, please wait."
git clone -b 1.4 --recursive --depth 1 https://github.com/mattburchett/NadekoBot.git
git clone -b release --recursive --depth 1 https://github.com/mattburchett/NadekoBot.git
echo ""
echo "NadekoBot downloaded."
@ -42,6 +42,7 @@ echo "Download done"
echo ""
echo "Building NadekoBot"
#dotnet add /opt/NadekoBot/src/NadekoBot package ImageSharp --version 1.0.0-alpha9-00194 --source https://www.myget.org/F/imagesharp/api/v3/index.json
dotnet build --configuration Release
echo ""
echo "Building done."