Bladeren bron

Update send

Dennis Rodewyk 1 jaar geleden
bovenliggende
commit
682bada95c
2 gewijzigde bestanden met toevoegingen van 26 en 6 verwijderingen
  1. 13 2
      data/services/send/containers.sh
  2. 13 4
      data/services/send/send.sh

+ 13 - 2
data/services/send/containers.sh

@@ -1,9 +1,20 @@
 send_service_dockerbunker() {
 	docker run -d \
 		--name=${FUNCNAME[0]//_/-} \
-		--restart=always \
-		--network ${NETWORK} \
+		--restart unless-stopped \
+		--network dockerbunker-${SERVICE_NAME} --net-alias send \
 		--env-file "${SERVICE_ENV}" \
 		-v ${SERVICE_NAME}-data-vol-1:${volumes[${SERVICE_NAME}-data-vol-1]} \
 	${IMAGES[service]} >/dev/null
 }
+
+send_redis_dockerbunker() {
+	docker run -d --user redis \
+		--restart unless-stopped \
+		--name ${FUNCNAME[0]//_/-} \
+		--network dockerbunker-${SERVICE_NAME} --net-alias redis \
+		-v ${SERVICE_NAME}-redis-vol-1:${volumes[${SERVICE_NAME}-redis-vol-1]} \
+	${IMAGES[redis]} >/dev/null
+}
+
+

+ 13 - 4
data/services/send/send.sh

@@ -13,11 +13,11 @@ for env in "${environment[@]}";do
 done
 
 declare -A WEB_SERVICES
-declare -a containers=( "${SERVICE_NAME}-service-dockerbunker" )
-declare -A volumes=( [${SERVICE_NAME}-data-vol-1]="/send/data" )
+declare -a containers=( "${SERVICE_NAME}-service-dockerbunker" "${SERVICE_NAME}-redis-dockerbunker" )
+declare -A volumes=( [${SERVICE_NAME}-data-vol-1]="/uploads" [${SERVICE_NAME}-redis-vol-1]="/data" )
 declare -a add_to_network=( "${SERVICE_NAME}-service-dockerbunker" )
-declare -a networks=( )
-declare -A IMAGES=( [service]="chaosbunker/${SERVICE_NAME}-docker" )
+declare -a networks=( "dockerbunker-${SERVICE_NAME}" )
+declare -A IMAGES=( [service]="registry.gitlab.com/timvisee/send:latest" [redis]="redis:alpine" )
 
 [[ -z $1 ]] && options_menu
 
@@ -35,6 +35,15 @@ configure() {
 	LE_EMAIL=${LE_EMAIL}
 
 	SERVICE_DOMAIN=${SERVICE_DOMAIN}
+	REDIS_HOST=redis
+	REDIS_PORT=6379
+	REDIS_USER=redis
+
+	S3_BUCKET=
+	S3_ENDPOINT=
+	S3_USE_PATH_STYLE_ENDPOINT=
+	AWS_ACCESS_KEY_ID=
+	AWS_SECRET_ACCESS_KEY=
 	EOF
 
 	post_configure_routine