From 3d32f0e953a726efa64b22e3676f2dc08b217e1c Mon Sep 17 00:00:00 2001 From: yjqg6666 Date: Tue, 12 Jul 2022 15:24:52 +0800 Subject: [PATCH] [#9067] archive offline-files and support env-var NO_HTTP_SERVER to skip nginx-running (#9068) --- .gitignore | 3 ++- contrib/offline/manage-offline-files.sh | 25 +++++++++++++++++-------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b8c20bc29..afb8c2d44 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,8 @@ **/vagrant_ansible_inventory *.iml temp -offline-files +contrib/offline/offline-files +contrib/offline/offline-files.tar.gz .idea .vscode .tox diff --git a/contrib/offline/manage-offline-files.sh b/contrib/offline/manage-offline-files.sh index 2ad6acd37..e949c70e6 100755 --- a/contrib/offline/manage-offline-files.sh +++ b/contrib/offline/manage-offline-files.sh @@ -1,18 +1,26 @@ #!/bin/bash -CURRENT_DIR=$(cd $(dirname $0); pwd) -OFFLINE_FILES_DIR="${CURRENT_DIR}/offline-files" +CURRENT_DIR=$( dirname "$(readlink -f "$0")" ) +OFFLINE_FILES_DIR_NAME="offline-files" +OFFLINE_FILES_DIR="${CURRENT_DIR}/${OFFLINE_FILES_DIR_NAME}" +OFFLINE_FILES_ARCHIVE="${CURRENT_DIR}/offline-files.tar.gz" FILES_LIST=${FILES_LIST:-"${CURRENT_DIR}/temp/files.list"} NGINX_PORT=8080 # download files -if [ ! -f ${FILES_LIST} ]; then - echo "${FILES_LIST} should exist." +if [ ! -f "${FILES_LIST}" ]; then + echo "${FILES_LIST} should exist, run ./generate_list.sh first." exit 1 fi -rm -rf ${OFFLINE_FILES_DIR} -mkdir ${OFFLINE_FILES_DIR} -wget -x -P ${OFFLINE_FILES_DIR} -i ${FILES_LIST} + +rm -rf "${OFFLINE_FILES_DIR}" +rm "${OFFLINE_FILES_ARCHIVE}" +mkdir "${OFFLINE_FILES_DIR}" + +wget -x -P "${OFFLINE_FILES_DIR}" -i "${FILES_LIST}" +tar -czvf "${OFFLINE_FILES_ARCHIVE}" "${OFFLINE_FILES_DIR_NAME}" + +[ -n "$NO_HTTP_SERVER" ] && echo "skip to run nginx" && exit 0 # run nginx container server if command -v nerdctl 1>/dev/null 2>&1; then @@ -25,11 +33,12 @@ else echo "No supported container runtime found" exit 1 fi + sudo "${runtime}" container inspect nginx >/dev/null 2>&1 if [ $? -ne 0 ]; then sudo "${runtime}" run \ --restart=always -d -p ${NGINX_PORT}:80 \ - --volume ${OFFLINE_FILES_DIR}:/usr/share/nginx/html/download \ + --volume "${OFFLINE_FILES_DIR}:/usr/share/nginx/html/download" \ --volume "$(pwd)"/nginx.conf:/etc/nginx/nginx.conf \ --name nginx nginx:alpine fi