From bfb489f00748d7d9a9c30e8a7bcc76b2a0b7fde5 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 15 Sep 2019 14:20:16 +0000 Subject: [PATCH] =?UTF-8?q?chmod=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Dockerfile | 11 ++++------- app/{id_ecdsa.key => id_ecdsa} | 0 db/Dockerfile | 1 + game.env | 2 +- install/Dockerfile | 1 + 5 files changed, 7 insertions(+), 8 deletions(-) rename app/{id_ecdsa.key => id_ecdsa} (100%) diff --git a/app/Dockerfile b/app/Dockerfile index 2aa09a4..efcb8c2 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -6,8 +6,7 @@ RUN apt -y update ;\ bzip2 git rsync \ libmemcached-dev libcurl4-openssl-dev libmcrypt-dev \ libicu-dev libjpeg-dev libpng-dev libwebp-dev libfreetype6-dev \ - libzip-dev libxml2-dev libsqlite3-dev gosu - + libzip-dev libxml2-dev libsqlite3-dev gosu; RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd; \ @@ -20,9 +19,8 @@ RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ pcntl \ pdo_mysql \ mysqli \ - zip \ - ; -RUN pecl install memcached mrypt + zip; +RUN pecl install memcached mcrypt; #from nextcloud setting RUN { \ echo 'opcache.enable=1'; \ @@ -47,8 +45,7 @@ RUN { \ VOLUME /var/www/html COPY entrypoint_hidche_app.sh /usr/local/bin/ -COPY id_ecdsa.key /var/www/.ssh/id_ecdsa -COPY known_hosts /var/www/.ssh/known_hosts +COPY id_ecdsa known_hosts /var/www/.ssh/ RUN \ chown www-data:www-data /var/www/.ssh/*; \ chmod 600 /var/www/.ssh/*; diff --git a/app/id_ecdsa.key b/app/id_ecdsa similarity index 100% rename from app/id_ecdsa.key rename to app/id_ecdsa diff --git a/db/Dockerfile b/db/Dockerfile index 9537671..93b640a 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -2,6 +2,7 @@ FROM mariadb #ubuntu COPY entrypoint_hidche_db.sh /usr/local/bin/ +RUN chmod +x /usr/local/bin/entrypoint_hidche_db.sh ENTRYPOINT ["entrypoint_hidche_db.sh"] diff --git a/game.env b/game.env index d3fa9a7..3a96593 100644 --- a/game.env +++ b/game.env @@ -1,6 +1,6 @@ #서버 git 주소. -#만약 https:// 대신 ssh://로 시작하는 주소를 사용하는 경우 app/id_ecdsa.key, app/known_host 에 ecdsa 개인키와 ssh값을 추가할 것. +#만약 https:// 대신 ssh://로 시작하는 주소를 사용하는 경우 app/id_ecdsa, app/known_host 에 ecdsa 개인키와 ssh값을 추가할 것. gameGitPath=ssh://git@storage.hided.net:2525/devsam/core.git imgGitPath=ssh://git@storage.hided.net:2525/devsam/image.git diff --git a/install/Dockerfile b/install/Dockerfile index e80756d..e0d5814 100644 --- a/install/Dockerfile +++ b/install/Dockerfile @@ -5,4 +5,5 @@ RUN pip3 install requests && \ rm -r /root/.cache COPY install_hidche.py /bin +RUN chmod +x /bin/install_hidche.py CMD install_hidche.py \ No newline at end of file