Merge branch 'release/v1.9.1'

Dockerfile

@@ -1,42 +1,26 @@
-FROM debian:jessie
+FROM openjdk:8-jdk-alpine3.7
 
 LABEL Description="This image is used to start the yona" maintainer="pokev25"
 
-ARG YONA_VERSION=1.8.1
-ARG YONA_DOWNLOAD_URL=https://github.com/yona-projects/yona/releases/download/v${YONA_VERSION}/yona-v${YONA_VERSION}-bin.zip
+ARG YONA_VERSION=1.9.1
+ARG YONA_BIN=yona-v${YONA_VERSION}-mariadb-10.2.bin.zip
+ARG YONA_DOWNLOAD_URL=https://github.com/yona-projects/yona/releases/download/v${YONA_VERSION}/${YONA_BIN}
 
-ENV DEBIAN_FRONTEND noninteractive
-
-## install Oracle Java 8 and clean up installation files
-RUN \
-  echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main" | tee /etc/apt/sources.list.d/webupd8team-java.list && \
-  echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list && \
-  echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
-  apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886 && \
-  apt-get update && \
-  apt-get install -y --no-install-recommends locales oracle-java8-installer oracle-java8-set-default unzip && \
-  apt-get clean && rm -rf /var/lib/apt/lists/* && rm -rf /var/cache/oracle-jdk8-installer
-
-## Set LOCALE to UTF8 # 
-RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
-    locale-gen en_US.UTF-8 && \
-    dpkg-reconfigure locales && \
-    /usr/sbin/update-locale LANG=en_US.UTF-8
-ENV LC_ALL en_US.UTF-8 
+## install package
+RUN apk add --no-cache unzip bash tzdata
 
 ## Timezone
-RUN echo "Asia/Seoul" > /etc/timezone && dpkg-reconfigure -f noninteractive tzdata
+ENV TZ Asia/Seoul
 
-## add yona user
-RUN useradd -m -d /yona -s /bin/bash -U yona && \
-    mkdir /yona/downloads
+## make work directory
+RUN mkdir -p /yona/downloads
 
 ## install yona
 RUN cd /yona/downloads && \
     wget --no-check-certificate $YONA_DOWNLOAD_URL && \
-    unzip -d /yona/release yona-v$YONA_VERSION-bin.zip && \
+    unzip -d /yona/release ${YONA_BIN} && \
     mv /yona/release/yona-$YONA_VERSION /yona/release/yona && \
-    rm -f yona-v$YONA_VERSION-bin.zip
+    rm -f ${YONA_BIN}
 
 ## set environment variables
 ENV YONA_DATA "/yona/data"
@@ -47,7 +31,7 @@ ADD ./entrypoints /yona/entrypoints
 RUN chmod +x /yona/entrypoints/*.sh
 
 ## yona home directory mount point from host to docker container
-VOLUME yona/data
+VOLUME /yona/data
 WORKDIR /yona
 
 ## yona service port expose from docker container to host

README.md

@@ -12,7 +12,7 @@ yona로 이전하기 위하여 위하여 fork버전을 수정함
 
 - src에서 빌드 부분을 제거
 - 1.* 버전으로 이전하기 위하여 yona프로젝트의 data-export 바이너리로 빌드함
- - data-export브랜치
+- data-export브랜치
 - docker-compose 추가
 
 

docker-compose.yml

@@ -3,7 +3,7 @@ version: '2'
 services:
   yona:
     build: .
-    image: pokev25/yona:1.8.1
+    image: pokev25/yona:1.9.1
     restart: always
     environment:
       - BEFORE_SCRIPT=before.sh

shell/config.sh

@@ -6,7 +6,7 @@ PROJECT_NAME="docker-yona"
 ############################################################
 ## docker configurations
 DOCKER_USER="pokev25"
-DOCKER_VERSION="1.8.1"
+DOCKER_VERSION="1.9.1"
 DOCKER_NAME="yona"
 DOCKER_IMAGE="$DOCKER_USER/$DOCKER_NAME:$DOCKER_VERSION"
 ############################################################