update to newest pyinfra & build dev image

This commit is contained in:
Francisco Schulz 2023-02-07 10:50:13 +01:00
parent 25fc7d84b9
commit 365dccc35a
5 changed files with 8 additions and 6 deletions

3
.gitignore vendored
View File

@ -1,7 +1,8 @@
.vscode/ .vscode/
*.h5 *.h5
/venv/ *venv*
.idea/ .idea/
src/data
!.gitignore !.gitignore
*.project *.project

View File

@ -22,7 +22,7 @@ then
else else
newVersion="${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" newVersion="${bamboo_planRepository_1_branch}_${bamboo_buildNumber}"
echo "gitTag=${newVersion}" > git.tag echo "gitTag=${newVersion}" > git.tag
echo "dev build with tag ${newVersion}" echo "dev build with tag dev-fschulz"
python3 -m venv build_venv python3 -m venv build_venv
source build_venv/bin/activate source build_venv/bin/activate
python3 -m pip install --upgrade pip 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 "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 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_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 exit 0
fi fi

@ -1 +1 @@
Subproject commit f7292c30ad7c7ae5f07cee6925adda096301b60a Subproject commit 6ec2e4fb0f6b2e4cedec197d3274759786cf1ab0

@ -1 +1 @@
Subproject commit 64d6a8cec62eeddf26bd71a9aabc28b40dcec901 Subproject commit b5b0c0f530202539fca1227edb9371d3fbb487ec

View File

@ -18,7 +18,7 @@ PyMuPDF==1.19.6
fpdf==1.7.2 fpdf==1.7.2
coverage==6.3.2 coverage==6.3.2
Pillow==9.1.0 Pillow==9.1.0
PDFNetPython3==9.1.0 PDFNetPython3==9.4.2
pdf2image==1.16.0 pdf2image==1.16.0
frozendict==2.3.0 frozendict==2.3.0
protobuf<=3.20.* protobuf<=3.20.*