diff --git a/.gitignore b/.gitignore index 9e95b52..8f20938 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ .vscode/ *.h5 -/venv/ +*venv* .idea/ +src/data !.gitignore *.project diff --git a/bamboo-specs/src/main/resources/scripts/docker-build.sh b/bamboo-specs/src/main/resources/scripts/docker-build.sh index 90a11f0..8d29249 100755 --- a/bamboo-specs/src/main/resources/scripts/docker-build.sh +++ b/bamboo-specs/src/main/resources/scripts/docker-build.sh @@ -22,7 +22,7 @@ then else newVersion="${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" echo "gitTag=${newVersion}" > git.tag - echo "dev build with tag ${newVersion}" + echo "dev build with tag dev-fschulz" python3 -m venv build_venv source build_venv/bin/activate python3 -m pip install --upgrade pip @@ -34,7 +34,8 @@ else echo "index-url = https://${bamboo_nexus_user}:${bamboo_nexus_password}@nexus.iqser.com/repository/python-combind/simple" >> pip.conf echo "${bamboo_nexus_password}" | docker login --username "${bamboo_nexus_user}" --password-stdin nexus.iqser.com:5001 docker build -f Dockerfile_base -t $SERVICE_NAME_BASE . - docker build -f Dockerfile -t nexus.iqser.com:5001/red/$SERVICE_NAME:${newVersion} . + docker build -f Dockerfile -t nexus.iqser.com:5001/red/$SERVICE_NAME:dev-fschulz . + docker push nexus.iqser.com:5001/red/$SERVICE_NAME:dev-fschulz exit 0 fi diff --git a/incl/pdf2image b/incl/pdf2image index f7292c3..6ec2e4f 160000 --- a/incl/pdf2image +++ b/incl/pdf2image @@ -1 +1 @@ -Subproject commit f7292c30ad7c7ae5f07cee6925adda096301b60a +Subproject commit 6ec2e4fb0f6b2e4cedec197d3274759786cf1ab0 diff --git a/incl/pyinfra b/incl/pyinfra index 64d6a8c..b5b0c0f 160000 --- a/incl/pyinfra +++ b/incl/pyinfra @@ -1 +1 @@ -Subproject commit 64d6a8cec62eeddf26bd71a9aabc28b40dcec901 +Subproject commit b5b0c0f530202539fca1227edb9371d3fbb487ec diff --git a/requirements.txt b/requirements.txt index da99202..5f12fb9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ PyMuPDF==1.19.6 fpdf==1.7.2 coverage==6.3.2 Pillow==9.1.0 -PDFNetPython3==9.1.0 +PDFNetPython3==9.4.2 pdf2image==1.16.0 frozendict==2.3.0 protobuf<=3.20.*