From eff52d6171cf965ef515270800a714336d42bf7c Mon Sep 17 00:00:00 2001 From: jukov_mn Date: Thu, 11 Jun 2026 11:33:47 +0500 Subject: [PATCH] upd --- .dockerignore | 15 ++++++++++++ .readthedocs.yaml | 23 ------------------ Jenkinsfile | 18 ++++++++------ docker/Dockerfile_old | 55 ------------------------------------------ image-40.jpg | Bin 16721 -> 0 bytes package.json | 2 +- requirements_old.txt | 19 --------------- 7 files changed, 26 insertions(+), 106 deletions(-) create mode 100644 .dockerignore delete mode 100644 .readthedocs.yaml delete mode 100644 docker/Dockerfile_old delete mode 100644 image-40.jpg delete mode 100644 requirements_old.txt 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 35de8e0367e523b11a434cce550e234d8e5bab30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16721 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.7.5 -mike - -weasyprint==52.5 -mkdocs-with-pdf - -mkdocs-bootswatch - -pymdown-extensions - -mkdocs-glightbox==0.4.0