瀏覽代碼

Use automated build for Mailpile

dennisro 5 年之前
父節點
當前提交
aba57598a4
共有 1 個文件被更改,包括 2 次插入42 次删除
  1. 2 42
      data/services/mailpile/mailpile.sh

+ 2 - 42
data/services/mailpile/mailpile.sh

@@ -14,49 +14,24 @@ done
 
 declare -A WEB_SERVICES
 declare -a containers=( "${SERVICE_NAME}-service-dockerbunker" )
-declare -A volumes=( [${SERVICE_NAME}-data-vol-1]="/mailpile-data" )
+declare -A volumes=( [${SERVICE_NAME}-data-vol-1]="/root/.local/share/Mailpile" [${SERVICE_NAME}-data-vol-2]="/root/.gnupg" )
 declare -a add_to_network=( "${SERVICE_NAME}-service-dockerbunker" )
 declare -a networks=( )
-declare -A IMAGES=( [service]="dockerbunker/dillinger" )
-declare -A BUILD_IMAGES=( [dockerbunker/${SERVICE_NAME}]="${DOCKERFILES}/${SERVICE_NAME}" )
+declare -A IMAGES=( [service]="chaosbunker/mailpile-docker" )
 
 [[ -z $1 ]] && options_menu
 
 configure() {
 	pre_configure_routine
 	
-	! [[ -d "${BASE_DIR}"/data/Dockerfiles/mailpile ]] \
-	&& git clone https://github.com/mailpile/Mailpile.git "${BASE_DIR}"/data/Dockerfiles/mailpile >/dev/null \
-	&& exit_response
-	
-	
 	echo -e "# \e[4mMailpile Settings\e[0m"
 	
 	set_domain
 	
-	unset COMMAND
-	prompt_confirm "Install in subdirectory?"
-	if [[ $? == 0 ]];then
-		if [ -z "$SUBDIR" ]; then
-			read -p "Enter subdirectory: /" -ei "mailpile" SUBDIR
-		else
-			read -p "Enter subdirectory: /" -ei "${SUBDIR}" SUBDIR
-		fi
-		LOCATION="^~ /${SUBDIR}"
-		PORT="12345"
-		COMMAND="./mp --www=0.0.0.0:${PORT}/${SUBDIR}"
-	else
-		PORT="33411"
-		LOCATION="/"
-	fi
-	
 	cat <<-EOF >> "${SERVICE_ENV}"
 	PROPER_NAME="${PROPER_NAME}"
 	SERVICE_NAME=${SERVICE_NAME}
 	PROMPT_SSL=${PROMPT_SSL}
-	SUBDIR="${SUBDIR}"
-	PORT=${PORT}
-	LOCATION="${LOCATION}"
 	COMMAND="${COMMAND}"
 	SSL_CHOICE=${SSL_CHOICE}
 	LE_EMAIL="${LE_EMAIL}"
@@ -68,23 +43,8 @@ configure() {
 	SERVICE_DOMAIN=${SERVICE_DOMAIN}
 	EOF
 
-	SUBSTITUTE=( "\${SERVICE_DOMAIN}" "\${PORT}" "\${LOCATION}" )
-
 	post_configure_routine
 }
-setup() {
-	# add volume section to dockerfile
-	[[ ! $(grep "VOLUME" "${BASE_DIR}/data/Dockerfiles/${SERVICE_NAME}/Dockerfile") ]] && sed -i "/EXPOSE/a VOLUME \/mailpile-data\/.local\/share\/Mailpile\nVOLUME \/mailpile-data\/.gnupg/" "${DOCKERFILES}"/${SERVICE_NAME}/Dockerfile
-
-	initial_setup_routine
-
-	SUBSTITUTE=( "\${SERVICE_DOMAIN}" "\${PORT}" "\${LOCATION}" )
-	basic_nginx
-
-	docker_run_all
-
-	post_setup_routine
-}
 
 if [[ $1 == "letsencrypt" ]];then
 	$1 $*