You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ka...@apache.org on 2020/12/01 16:45:30 UTC
[airflow-site] branch revert-docs-break created (now bb6df77)
This is an automated email from the ASF dual-hosted git repository.
kaxilnaik pushed a change to branch revert-docs-break
in repository https://gitbox.apache.org/repos/asf/airflow-site.git.
at bb6df77 Revert "User-friendly output for site.sh (#319)"
This branch includes the following new commits:
new 13b707c Revert "Copy docs for staable version to /docs/stable/ (#321)"
new bb6df77 Revert "User-friendly output for site.sh (#319)"
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[airflow-site] 01/02: Revert "Copy docs for staable version to
/docs/stable/ (#321)"
Posted by ka...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kaxilnaik pushed a commit to branch revert-docs-break
in repository https://gitbox.apache.org/repos/asf/airflow-site.git
commit 13b707cd239c4fb052d9d14c32877cebbc9718ba
Author: Kaxil Naik <ka...@gmail.com>
AuthorDate: Tue Dec 1 16:44:57 2020 +0000
Revert "Copy docs for staable version to /docs/stable/ (#321)"
This reverts commit 2b5c4d68437b5fe029add7588921ef51b7d8e40e.
---
site.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/site.sh b/site.sh
index b466ad3..7c94a89 100755
--- a/site.sh
+++ b/site.sh
@@ -262,7 +262,7 @@ function build_site {
version="$(basename -- "${doc_path}")"
verbose_copy "${doc_path}" "dist/docs/${version}/"
done
- verbose_copy "docs-archive/$(cat docs-archive/stable.txt)/" "dist/docs/stable/"
+ verbose_copy "docs-archive/$(cat docs-archive/stable.txt)" "dist/docs/stable/"
create_index dist/docs
}
[airflow-site] 02/02: Revert "User-friendly output for site.sh
(#319)"
Posted by ka...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kaxilnaik pushed a commit to branch revert-docs-break
in repository https://gitbox.apache.org/repos/asf/airflow-site.git
commit bb6df7740b8f18cc57e75276d96c684a9e754f54
Author: Kaxil Naik <ka...@gmail.com>
AuthorDate: Tue Dec 1 16:45:04 2020 +0000
Revert "User-friendly output for site.sh (#319)"
This reverts commit bfff9ee953941ba4b628a1efd4103225ef6ac87c.
---
site.sh | 83 ++++++++++++++++++++---------------------------------------------
1 file changed, 25 insertions(+), 58 deletions(-)
diff --git a/site.sh b/site.sh
index 7c94a89..aa26e88 100755
--- a/site.sh
+++ b/site.sh
@@ -16,7 +16,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-set -euo pipefail
+set -euox pipefail
WORKING_DIR="$(pwd)"
MY_DIR="$(cd "$(dirname "$0")" && pwd)"
@@ -25,12 +25,6 @@ pushd "${MY_DIR}" &>/dev/null || exit 1
IMAGE_NAME=airflow-site
CONTAINER_NAME=airflow-site-c
-function log {
- GRAY='\033[1;30m'
- NC='\033[0m' # No Color
- echo -e "${GRAY}$(date +'%Y-%m-%d %H:%M:%S'):INFO: ${*} ${NC}" >&2;
-}
-
function usage {
cat << EOF
usage: ${0} <command> [<args>]
@@ -68,17 +62,15 @@ EOF
}
function ensure_image_exists {
- log "Checking if image exists: ${IMAGE_NAME}"
if [[ ! $(docker images "${IMAGE_NAME}" -q) ]]; then
- log "Image not exists."
+ echo "Image not exists."
build_image
fi
}
function ensure_container_exists {
- log "Checking if container exists: ${CONTAINER_NAME}"
if [[ ! $(docker container ls -a --filter="Name=${CONTAINER_NAME}" -q ) ]]; then
- log "Container not exists"
+ echo "Container not exists"
docker run \
--detach \
--name "${CONTAINER_NAME}" \
@@ -91,41 +83,37 @@ function ensure_container_exists {
}
function ensure_container_running {
- log "Checking if container running: ${CONTAINER_NAME}"
container_status="$(docker inspect "${CONTAINER_NAME}" --format '{{.State.Status}}')"
- log "Current container status: ${container_status}"
+ echo "Current container status: ${container_status}"
if [[ ! "${container_status}" == "running" ]]; then
- log "Container not running. Starting the container."
+ echo "Container not running. Starting the container."
docker start "${CONTAINER_NAME}"
fi
}
function ensure_node_module_exists {
- log "Checking if node module exists"
if [[ ! -d landing-pages/node_modules/ ]] ; then
- log "Missing node dependencies. Start installation."
+ echo "Missing node dependencies. Start installation."
run_command "/opt/site/landing-pages/" yarn install
- log "Dependencies installed."
+ echo "Dependencies installed."
fi
}
function ensure_that_website_is_build {
- log "Check if landing-pages/dist/index.html file exists"
if [[ ! -f landing-pages/dist/index.html ]] ; then
- log "The website is not built. Start building."
+ echo "The website is not built. Start building."
run_command "/opt/site/landing-pages/" npm run build
- log "The website builded."
+ echo "The website builded."
fi
}
function build_image {
- log "Start building image"
+ echo "Start building image"
docker build -t airflow-site .
- log "End building image"
+ echo "End building image"
}
function run_command {
- log "Running command: $*"
working_directory=$1
shift
if [[ -f /.dockerenv ]] ; then
@@ -148,7 +136,6 @@ function run_command {
}
function prepare_environment {
- log "Preparing environment"
if [[ ! -f /.dockerenv ]] ; then
ensure_image_exists
ensure_container_exists
@@ -215,79 +202,59 @@ function run_lint {
}
function prepare_docs_index {
- log "Preparing docs index"
run_command "/opt/site/docs-archive/" ./show_docs_index_json.sh > landing-pages/site/static/_gen/docs-index.json
}
function build_landing_pages {
- log "Building landing pages"
run_command "/opt/site/landing-pages/" npm run index
prepare_docs_index
run_command "/opt/site/landing-pages/" npm run build
}
-function create_index {
- output_path="$1/index.html"
- log "Creating index: ${output_path}"
-
- cat > "${output_path}" << EOF
-<!DOCTYPE html>
-<html>
- <head><meta http-equiv="refresh" content="1; url=stable/" /></head>
- <body></body>
-</html>
-EOF
-}
-
-function verbose_copy {
- source="$1"
- target="$2"
- log "Copying '$source' to '$target'"
- mkdir -p "${target}"
- cp -R "$source" "$target"
-}
-
function build_site {
- log "Building full site"
-
if [[ ! -f "landing-pages/dist/index.html" ]]; then
build_landing_pages
fi
mkdir -p dist
rm -rf dist/*
- verbose_copy landing-pages/dist/. dist/
+ cp -R landing-pages/dist/. dist/
mkdir -p dist/docs/
rm -rf dist/docs/*
for doc_path in docs-archive/*/ ; do
version="$(basename -- "${doc_path}")"
- verbose_copy "${doc_path}" "dist/docs/${version}/"
+ cp -R "${doc_path}" "dist/docs/${version}/"
done
- verbose_copy "docs-archive/$(cat docs-archive/stable.txt)" "dist/docs/stable/"
- create_index dist/docs
+ cp -R "docs-archive/$(cat docs-archive/stable.txt)" "dist/docs/stable/"
+ cat > dist/docs/index.html << EOF
+<!DOCTYPE html>
+<html>
+ <head><meta http-equiv="refresh" content="1; url=stable/" /></head>
+ <body></body>
+</html>
+EOF
}
function cleanup_environment {
container_status="$(docker inspect "${CONTAINER_NAME}" --format '{{.State.Status}}')"
- log "Current container status: ${container_status}"
+ echo "Current container status: ${container_status}"
if [[ "${container_status}" == "running" ]]; then
- log "Container running. Killing the container."
+ echo "Container running. Killing the container."
docker kill "${CONTAINER_NAME}"
fi
if [[ $(docker container ls -a --filter="Name=${CONTAINER_NAME}" -q ) ]]; then
- log "Container exists. Removing the container."
+ echo "Container exists. Removing the container."
docker rm "${CONTAINER_NAME}"
fi
if [[ $(docker images "${IMAGE_NAME}" -q) ]]; then
- log "Images exists. Deleting the image."
+ echo "Images exists. Deleeting the image."
docker rmi "${IMAGE_NAME}"
fi
}
function prepare_theme {
- log "Preparing theme files"
SITE_DIST="landing-pages/dist"
THEME_GEN="sphinx_airflow_theme/sphinx_airflow_theme/static/_gen"
mkdir -p "${THEME_GEN}/css" "${THEME_GEN}/js"