diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..0cc5676 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,15 @@ +*.md +.cache +node_modules/ +docker-compose.yml +Dockerfile +.git* +#source +#.npmrc +.eslintrc.json +#./package*.json +yarn.lock +config/ +Jenkinsfile* +ecosystem.config.js +.env* \ No newline at end of file diff --git a/.readthedocs.yaml b/.readthedocs.yaml deleted file mode 100644 index 0b7bd5a..0000000 --- a/.readthedocs.yaml +++ /dev/null @@ -1,23 +0,0 @@ -# .readthedocs.yaml -# Read the Docs configuration file -# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details - -# Required -version: 2 -build: - os: "ubuntu-22.04" - tools: - python: "3.8" - -python: - install: - - requirements: mkdocs/requirements.txt - -mkdocs: - configuration: mkdocs.yml - -# Optionally set the version of Python and requirements required to build your docs -# python: -# version: "3.8" -# install: -# - requirements: mkdocs/requirements.txt \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 851aae4..434f694 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,7 @@ node { checkout scm docker_tag = 'latest' - projectname ='app' + projectname ='doc' packagejson = readJSON file: 'package.json' docker_tag = packagejson['version'] @@ -14,7 +14,9 @@ node { image_doc_latest = image_name + ':latest'; } pipeline { - agent any + agent { + label 'jenkins-node-01' + } options { timestamps() buildDiscarder logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '5') @@ -53,11 +55,11 @@ pipeline { } } } - stage('docker cleanup'){ - steps { - sh label: '', script: 'docker rmi ' + image_doc - sh label: '', script: 'docker rmi ' + image_doc_latest - } - } + // stage('docker cleanup'){ + // steps { + // sh label: '', script: 'docker rmi ' + image_doc + // sh label: '', script: 'docker rmi ' + image_doc_latest + // } + // } } } \ No newline at end of file diff --git a/docker/Dockerfile_old b/docker/Dockerfile_old deleted file mode 100644 index 3f299d3..0000000 --- a/docker/Dockerfile_old +++ /dev/null @@ -1,55 +0,0 @@ -FROM alpine:3.16 AS builder - -ENV MKDOCS_VERSION=1.1.0 \ - DOCS_DIRECTORY='/mkdocs' \ - LIVE_RELOAD_SUPPORT='false' \ - ADD_MODULES='false' \ - FAST_MODE='false' \ - PYTHONUNBUFFERED=1 \ - GIT_REPO='false' \ - GIT_BRANCH='master' \ - AUTO_UPDATE='false' \ - UPDATE_INTERVAL=15 - -RUN \ - apk add --update \ - ca-certificates \ - bash \ - git \ - openssh \ - python3 \ - python3-dev \ - py3-setuptools \ - py-pip \ - build-base - -ADD docker/container-files/ / - -RUN python -m venv /src/env -# Enable venv -ENV PATH="/src/env/bin:$PATH" - -ADD requirements.txt /src/ - -RUN \ - pip install --upgrade pip && \ - pip install --ignore-installed -r /src/requirements.txt && \ - cd /bootstrap && pip install -e /bootstrap && \ - rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/* && \ - chmod 600 /root/.ssh/config - -CMD ["/usr/bin/bootstrap", "start"] - -FROM builder as makestatic -ADD docs /src/docs/ -#ADD overrides /src/overrides/ -ADD mkdocs.yml /src/ -ENV PATH="/src/env/bin:$PATH" - -RUN cd /src && properdocs build -#RUN cd /src && mkdocs build - -FROM nginx -# RUN rm /etc/nginx/sites-enabled/default -COPY docker/default.conf /etc/nginx/conf.d/default.conf -COPY --from=makestatic /src/site /sites/app.lexema.ru/docs \ No newline at end of file diff --git a/image-40.jpg b/image-40.jpg deleted file mode 100644 index 35de8e0..0000000 Binary files a/image-40.jpg and /dev/null differ diff --git a/package.json b/package.json index faae17a..19cfe36 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { "name": "ecm-administrator-manuals", - "version": "0.0.1", + "version": "0.0.2", "description": "ecm-administrator-manuals doc" } \ No newline at end of file diff --git a/requirements_old.txt b/requirements_old.txt deleted file mode 100644 index 5623382..0000000 --- a/requirements_old.txt +++ /dev/null @@ -1,19 +0,0 @@ -#mkdocs==1.4.0 -properdocs==1.6.7 -mkdocs-literate-nav -mkdocs-section-index -mkdocs-include-markdown-plugin - -mkdocs-video -#mkdocs-material==8.5.8 -mkdocs-material>=9.7.5 -mike - -weasyprint==52.5 -mkdocs-with-pdf - -mkdocs-bootswatch - -pymdown-extensions - -mkdocs-glightbox==0.4.0