diff --git a/Dockerfile b/Dockerfile index 4edc6d6..7f49f12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,14 @@ FROM openjdk:8-jre-alpine -ENV AOZORA_EPUB3 AozoraEpub3-1.1.0b46.zip +#ENV AOZORA_EPUB3 AozoraEpub3-1.1.0b46.zip ENV KINDLEGEN kindlegen_linux_2.6_i386_v2_9.tar.gz -ENV NAROU_VERSION 3.4.7.1 +ENV NAROU_VERSION 3.5.1 WORKDIR /opt/narou -RUN apk --update add ruby ruby-io-console ruby-json wget unzip && rm -rf /var/cache/apk/* +RUN apk --update add ruby ruby-io-console ruby-json ruby-etc wget unzip && rm -rf /var/cache/apk/* -RUN wget https://github.com/jam7/AozoraEpub3/releases/download/1.1.0b46/${AOZORA_EPUB3} -O /opt/AozoraEpub3.zip -RUN wget https://github.com/jam7/AozoraEpub3/releases/download/openjdk-support/AozoraEpub3.jar -O /opt/AozoraEpub3.jar +RUN wget https://github.com/kyukyunyorituryo/AozoraEpub3/releases/download/1.1.1b3Q/AozoraEpub3-1.1.1b3Q.zip -O /opt/AozoraEpub3.zip +#RUN wget https://github.com/jam7/AozoraEpub3/releases/download/1.1.0b46/${AOZORA_EPUB3} -O /opt/AozoraEpub3.zip +#RUN wget https://github.com/jam7/AozoraEpub3/releases/download/openjdk-support/AozoraEpub3.jar -O /opt/AozoraEpub3.jar RUN wget http://kindlegen.s3.amazonaws.com/${KINDLEGEN} && \ mkdir -p /opt/kindlegen && \ diff --git a/Makefile b/Makefile index aaedaad..dddc1d2 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -RELEASE_VERSION = v1.13 +RELEASE_VERSION = v1.14 VERSION = latest OPTIONS = \ diff --git a/init.sh b/init.sh index 6e193c0..f94c162 100755 --- a/init.sh +++ b/init.sh @@ -2,7 +2,7 @@ if [ ! -d "/opt/narou/.narou" ]; then unzip -q /opt/AozoraEpub3.zip -d /opt/narou/AozoraEpub3 - cp /opt/AozoraEpub3.jar /opt/narou/AozoraEpub3 +# cp /opt/AozoraEpub3.jar /opt/narou/AozoraEpub3 ln -s /opt/kindlegen/kindlegen /opt/narou/AozoraEpub3 narou init -p /opt/narou/AozoraEpub3 -l 1.6 narou setting device=kindle