diff --git a/dockerfiles/tasks/apidocjs/Dockerfile b/dockerfiles/tasks/apidocjs/Dockerfile index c92aef4..abb1eec 100644 --- a/dockerfiles/tasks/apidocjs/Dockerfile +++ b/dockerfiles/tasks/apidocjs/Dockerfile @@ -18,4 +18,4 @@ RUN apk --no-cache add \ ADD ./entrypoint-apidocs.sh /scripts/entrypoint.sh RUN chmod +x -R /scripts && mkdir /src -ENTRYPOINT /scripts/entrypoint.sh +ENTRYPOINT ["/scripts/entrypoint.sh"] diff --git a/dockerfiles/tasks/apidocjs/build.sh b/dockerfiles/tasks/apidocjs/build.sh index 909a319..77484d5 100755 --- a/dockerfiles/tasks/apidocjs/build.sh +++ b/dockerfiles/tasks/apidocjs/build.sh @@ -1,13 +1,18 @@ #!/usr/bin/env bash set -e -#set -x +set -x #build docker build --rm -f Dockerfile -t apidocjs:latest . #test -docker run --rm --entrypoint=node apidocjs --version -docker run --rm apidocjs apidoc | grep 'apidoc.json' +echo node version: "$(docker run --rm --entrypoint=node apidocjs --version)" +# shellcheck disable=SC2046 +[ -z "$(docker run --rm -u$(id -ru) -v ${PWD}/test:/src apidocjs --silent | grep "not found in block")" ] +ls -l test/build/docs/index.html + +##cleanup after test +rm -r test/build #save docker tag apidocjs:latest dkregistry.xai-corp.net:5000/xaicorp/apidocjs:latest diff --git a/dockerfiles/tasks/apidocjs/entrypoint-apidocs.sh b/dockerfiles/tasks/apidocjs/entrypoint-apidocs.sh index a6544b3..689e00d 100755 --- a/dockerfiles/tasks/apidocjs/entrypoint-apidocs.sh +++ b/dockerfiles/tasks/apidocjs/entrypoint-apidocs.sh @@ -8,6 +8,8 @@ echo Using file filter: "${FILE_FILTER}" echo cd /src/ || exit -echo ${APP_DIR} : ${DOCS_DIR} : ${FILE_FILTER} -rm -rf ${DOCS_DIR} && mkdir -p ${DOCS_DIR} -apidoc -i ${APP_DIR} -o ${DOCS_DIR} -f ${FILE_FILTER} +echo "${APP_DIR}" : "${DOCS_DIR}" : "${FILE_FILTER}" +rm -rf "${DOCS_DIR}" && mkdir -p "${DOCS_DIR}" + +# shellcheck disable=SC2068 +apidoc -i "${APP_DIR}" -o "${DOCS_DIR}" -f "${FILE_FILTER}" $@ diff --git a/dockerfiles/tasks/apidocjs/test/apidoc.json b/dockerfiles/tasks/apidocjs/test/apidoc.json new file mode 100644 index 0000000..7905d49 --- /dev/null +++ b/dockerfiles/tasks/apidocjs/test/apidoc.json @@ -0,0 +1,4 @@ +{ + "name": "Test Api", + "version": "0.0.1" +} diff --git a/dockerfiles/tasks/apidocjs/test/app/docs.php b/dockerfiles/tasks/apidocjs/test/app/docs.php new file mode 100644 index 0000000..6bf6709 --- /dev/null +++ b/dockerfiles/tasks/apidocjs/test/app/docs.php @@ -0,0 +1,8 @@ +