ssh git이 가능하도록 변경, cron 버그 수정, fpm timezone 수정
This commit is contained in:
+10
-2
@@ -37,14 +37,22 @@ RUN { \
|
||||
\
|
||||
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
|
||||
\
|
||||
mkdir /var/www/data; \
|
||||
mkdir -p /var/www/data; \
|
||||
chown -R www-data:root /var/www; \
|
||||
chmod -R g=u /var/www
|
||||
chmod -R g=u /var/www; \
|
||||
mkdir -p /var/www/.ssh; \
|
||||
chown www-data:www-data /var/www/.ssh; \
|
||||
chmod 700 /var/www/.ssh
|
||||
|
||||
VOLUME /var/www/html
|
||||
|
||||
ENV TZ=Asia/Seoul
|
||||
|
||||
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
|
||||
RUN \
|
||||
chown www-data:www-data /var/www/.ssh/*; \
|
||||
chmod 600 /var/www/.ssh/*;
|
||||
ENTRYPOINT ["entrypoint_hidche_app.sh"]
|
||||
CMD ["php-fpm"]
|
||||
@@ -1,27 +1,25 @@
|
||||
#!/bin/bash
|
||||
set -euxo pipefail
|
||||
set -uxo pipefail
|
||||
shopt -s nullglob
|
||||
|
||||
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
printf "[PHP]\ndate.timezone = \"$TZ\"\n" > /usr/local/etc/php/conf.d/tzone.ini
|
||||
|
||||
wwwRoot="/var/www/html"
|
||||
samRoot="$wwwRoot/sam"
|
||||
imageRoot="$wwwRoot/image"
|
||||
|
||||
gameGitPath="https://storage.hided.net/gogs/devsam/core.git"
|
||||
imgGitPath="https://storage.hided.net/gogs/devsam/image.git"
|
||||
|
||||
|
||||
if [ ! -f "$wwwRoot/index.php" ]; then
|
||||
echo "<?php header('location:sam',TRUE,301);" > $wwwRoot/index.php
|
||||
chown www-data:www-data $wwwRoot/index.php
|
||||
fi
|
||||
|
||||
if [ ! -f "$samRoot/index.php" ]; then
|
||||
gosu www-data git clone $gameGitPath /var/www/html/sam
|
||||
fi
|
||||
|
||||
if [ $HIDCHE_IMAGE_USE_INTERNAL = "yes" ] && [ ! -d "$imageRoot" ]; then
|
||||
if [[ "$imageRoot" =~ ^ssh ]]; then
|
||||
query=`echo "<?php \\\$a=parse_url('$imageRoot');echo join(' ', [\\\$a['port']?'-p '.\\\$a['port']:'',\\\$a['host']]);" | php`
|
||||
ssh-keyscan $query >> /var/www/.ssh/known_hosts 2>/dev/null;
|
||||
chown www-data:www-data /var/www/.ssh/known_hosts
|
||||
chmod 600 /var/www/.ssh/known_hosts
|
||||
fi
|
||||
gosu www-data git clone $imgGitPath /var/www/html/image
|
||||
fi
|
||||
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
-----BEGIN EC PRIVATE KEY-----
|
||||
MHcCAQEEIFPwAmkXCRG4Q7RSUqL9uzi4SF09iXQGB785l3/Hbw0woAoGCCqGSM49
|
||||
AwEHoUQDQgAEpGiOeQnFmPb3fecADT0jikWWO03WvJIGux5j4+kh/g3FXP2Fjb1V
|
||||
4SI264WpBZFTdoSyLKXWvrLeQCXZsZwa2w==
|
||||
-----END EC PRIVATE KEY-----
|
||||
@@ -0,0 +1,3 @@
|
||||
[storage.hided.net]:2525 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCb9BLlqXb8jsnho4Db6WTMQOnhjxC42lanowDicTjzaan7JgTrRxFbrLL8zUcqMhNpFBqD9oUxV2gKD00/BoVtXEbjKoa+GjKtDyU+RfejaAw4j+nVZjyjvXoIKMyzr6NqjA3mLdcd47KLZKtFQNKcOL00foMsqYJhmr75UM6scfCj8+KnjVLkNdlFtJ9fGlnA1FGmEoldHR+htN01E/Yx8teHQGo5W0hZ/tOvE+r7NWA2PXFqOrb+IXe3URVndDZb1idInQDuMRetrWgCEZSy4/sTIss030wkHkUdDuLCt2NnUvLEVlxvpQw72k9j/nRapkGthwN7x1L8yQYKY6iv|1|XTprP1yTMznxEkakYqFoyNVBs7A=|8wea12ZyJ0L/nHHQ3nEtWJHlikA= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCb9BLlqXb8jsnho4Db6WTMQOnhjxC42lanowDicTjzaan7JgTrRxFbrLL8zUcqMhNpFBqD9oUxV2gKD00/BoVtXEbjKoa+GjKtDyU+RfejaAw4j+nVZjyjvXoIKMyzr6NqjA3mLdcd47KLZKtFQNKcOL00foMsqYJhmr75UM6scfCj8+KnjVLkNdlFtJ9fGlnA1FGmEoldHR+htN01E/Yx8teHQGo5W0hZ/tOvE+r7NWA2PXFqOrb+IXe3URVndDZb1idInQDuMRetrWgCEZSy4/sTIss030wkHkUdDuLCt2NnUvLEVlxvpQw72k9j/nRapkGthwN7x1L8yQYKY6iv
|
||||
|1|3UOicj4TheEV6TEnSfmHNKhpuWU=|EL7zXO8enUCmq5tmi4WlxuEp2BM= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCb9BLlqXb8jsnho4Db6WTMQOnhjxC42lanowDicTjzaan7JgTrRxFbrLL8zUcqMhNpFBqD9oUxV2gKD00/BoVtXEbjKoa+GjKtDyU+RfejaAw4j+nVZjyjvXoIKMyzr6NqjA3mLdcd47KLZKtFQNKcOL00foMsqYJhmr75UM6scfCj8+KnjVLkNdlFtJ9fGlnA1FGmEoldHR+htN01E/Yx8teHQGo5W0hZ/tOvE+r7NWA2PXFqOrb+IXe3URVndDZb1idInQDuMRetrWgCEZSy4/sTIss030wkHkUdDuLCt2NnUvLEVlxvpQw72k9j/nRapkGthwN7x1L8yQYKY6iv
|
||||
|1|M8V56tJHA+xiw51scQfhSs5nZeE=|wIw/fQk0MR3l7Bo3Mqd0zR+S4rE= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCb9BLlqXb8jsnho4Db6WTMQOnhjxC42lanowDicTjzaan7JgTrRxFbrLL8zUcqMhNpFBqD9oUxV2gKD00/BoVtXEbjKoa+GjKtDyU+RfejaAw4j+nVZjyjvXoIKMyzr6NqjA3mLdcd47KLZKtFQNKcOL00foMsqYJhmr75UM6scfCj8+KnjVLkNdlFtJ9fGlnA1FGmEoldHR+htN01E/Yx8teHQGo5W0hZ/tOvE+r7NWA2PXFqOrb+IXe3URVndDZb1idInQDuMRetrWgCEZSy4/sTIss030wkHkUdDuLCt2NnUvLEVlxvpQw72k9j/nRapkGthwN7x1L8yQYKY6iv
|
||||
Reference in New Issue
Block a user