mirror of
https://gitlab.com/psono/psono-fileserver
synced 2025-04-18 12:24:05 +03:00
Upgraded to python 3.10
Signed-off-by: Sascha Pfeiffer <sascha.pfeiffer@esaqa.com>
This commit is contained in:
Sascha Pfeiffer
parent
d6121297f6
commit
4b88990bae
107
.gitlab-ci.yml
107
.gitlab-ci.yml
@ -12,15 +12,19 @@ build-container-alpine:
|
||||
except:
|
||||
- schedules
|
||||
stage: build
|
||||
image: psono-docker.jfrog.io/ubuntu:18.04
|
||||
image: psono-docker.jfrog.io/ubuntu:22.04
|
||||
services:
|
||||
- docker:18-dind
|
||||
- name: docker:20-dind
|
||||
alias: docker
|
||||
command: ["--tls=false"]
|
||||
variables:
|
||||
DOCKER_HOST: 'tcp://docker:2375'
|
||||
DOCKER_DRIVER: overlay2
|
||||
DOCKER_HOST: tcp://docker:2375/
|
||||
DOCKER_TLS_CERTDIR: ""
|
||||
script:
|
||||
- sh ./var/update_version.sh
|
||||
- apt-get update && apt-get install -y curl
|
||||
- curl -fSL "https://download.docker.com/linux/static/stable/x86_64/docker-17.12.1-ce.tgz" -o docker.tgz && echo "1270dce1bd7e1838d62ae21d2505d87f16efc1d9074645571daaefdfd0c14054 *docker.tgz" | sha256sum -c - && tar -xzvf docker.tgz && mv docker/* /usr/local/bin/ && rm -Rf docker*
|
||||
- curl -fSL "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.17.tgz" -o docker.tgz && echo "969210917b5548621a2b541caf00f86cc6963c6cf0fb13265b9731c3b98974d9 *docker.tgz" | sha256sum -c - && tar -xzvf docker.tgz && mv docker/* /usr/local/bin/ && rm -Rf docker && rm docker.tgz
|
||||
- docker info
|
||||
- echo $CI_JOB_TOKEN | docker login --username=gitlab-ci-token --password-stdin registry.gitlab.com
|
||||
- echo $artifactory_credentials | docker login --username=gitlab --password-stdin psono-docker.jfrog.io
|
||||
@ -37,8 +41,15 @@ run-unittests-ubuntu:
|
||||
except:
|
||||
- schedules
|
||||
stage: test
|
||||
image: psono-docker.jfrog.io/docker:19.03.8-git
|
||||
image: psono-docker.jfrog.io/docker:20.10.17-git
|
||||
services:
|
||||
- name: docker:20-dind
|
||||
alias: docker
|
||||
command: ["--tls=false"]
|
||||
variables:
|
||||
DOCKER_DRIVER: overlay2
|
||||
DOCKER_HOST: tcp://docker:2375/
|
||||
DOCKER_TLS_CERTDIR: ""
|
||||
POSTGRES_DB: postgres
|
||||
POSTGRES_USER: postgres
|
||||
POSTGRES_PASSWORD: ""
|
||||
@ -46,26 +57,31 @@ run-unittests-ubuntu:
|
||||
PSONO_EMAIL_FROM: test@example.com
|
||||
PSONO_ACTIVATION_LINK_SECRET: 9SruC2qPmKScVzGaF4378LW4rvNNkK2G3Gddqy9kPQqgkjeDQjs7jaLBCstgtJTt
|
||||
PSONO_SECRET_KEY: RQTKawYQv4w6KkuphcLzLu7r5ap7xE5DSDu5SkKXjMnWBQ93mcMKjdZfeZkY2Y7C
|
||||
services:
|
||||
- docker:18-dind
|
||||
script:
|
||||
- docker info
|
||||
- echo $CI_JOB_TOKEN | docker login --username=gitlab-ci-token --password-stdin registry.gitlab.com
|
||||
- echo $artifactory_credentials | docker login --username=gitlab --password-stdin psono-docker.jfrog.io
|
||||
- echo $docker_hub_credentials | docker login --username=psonogitlab --password-stdin
|
||||
- sh ./var/update_version.sh
|
||||
- docker build -f DockerfileUbuntu2004 -t ubu2004-testimage --pull .
|
||||
- docker build -f DockerfileUbuntu -t ubu-testimage --pull .
|
||||
- docker run -d --name db postgres:9.6.16
|
||||
- sleep 20
|
||||
- docker run --link db:postgres ubu2004-testimage bash -c "apt-get update && apt-get install -y python3-pip && pip3 install -r requirements-dev.txt && pip3 install mypy==0.812 && python3 /usr/local/bin/mypy -p psono --ignore-missing-imports && python3 ./psono/manage.py migrate && coverage3 run --source='.' ./psono/manage.py test restapi.tests cron.tests && coverage3 report --omit=psono/restapi/migrations/*,psono/administration/tests*,psono/administration/migrations/*,psono/restapi/tests*"
|
||||
- docker run --link db:postgres ubu-testimage bash -c "apt-get update && apt-get install -y python3-pip && pip3 install -r requirements-dev.txt && python3 ./psono/manage.py migrate && coverage3 run --source='.' ./psono/manage.py test restapi.tests cron.tests && coverage3 report --omit=psono/restapi/migrations/*,psono/administration/tests*,psono/administration/migrations/*,psono/restapi/tests*"
|
||||
|
||||
|
||||
run-unittests-alpine:
|
||||
except:
|
||||
- schedules
|
||||
stage: test
|
||||
image: psono-docker.jfrog.io/docker:19.03.8-git
|
||||
image: psono-docker.jfrog.io/docker:20.10.17-git
|
||||
services:
|
||||
- name: docker:20-dind
|
||||
alias: docker
|
||||
command: ["--tls=false"]
|
||||
variables:
|
||||
DOCKER_DRIVER: overlay2
|
||||
DOCKER_HOST: tcp://docker:2375/
|
||||
DOCKER_TLS_CERTDIR: ""
|
||||
POSTGRES_DB: postgres
|
||||
POSTGRES_USER: postgres
|
||||
POSTGRES_PASSWORD: ""
|
||||
@ -73,8 +89,6 @@ run-unittests-alpine:
|
||||
PSONO_EMAIL_FROM: test@example.com
|
||||
PSONO_ACTIVATION_LINK_SECRET: 9SruC2qPmKScVzGaF4378LW4rvNNkK2G3Gddqy9kPQqgkjeDQjs7jaLBCstgtJTt
|
||||
PSONO_SECRET_KEY: RQTKawYQv4w6KkuphcLzLu7r5ap7xE5DSDu5SkKXjMnWBQ93mcMKjdZfeZkY2Y7C
|
||||
services:
|
||||
- docker:18-dind
|
||||
script:
|
||||
- docker info
|
||||
- echo $CI_JOB_TOKEN | docker login --username=gitlab-ci-token --password-stdin registry.gitlab.com
|
||||
@ -86,40 +100,19 @@ run-unittests-alpine:
|
||||
- docker run --link db:postgres $CONTAINER_TEST_IMAGE /bin/sh -c "pip3 install -r requirements-dev.txt && python3 ./psono/manage.py migrate && python3 ./psono/manage.py test --parallel=8 restapi.tests cron.tests"
|
||||
|
||||
|
||||
#run-unittests-centos7:
|
||||
# except:
|
||||
# - schedules
|
||||
# stage: test
|
||||
# image: psono-docker.jfrog.io/docker:19.03.8-git
|
||||
# variables:
|
||||
# POSTGRES_DB: postgres
|
||||
# POSTGRES_USER: postgres
|
||||
# POSTGRES_PASSWORD: ""
|
||||
# PSONO_EMAIL_HOST: 172.17.0.1
|
||||
# PSONO_EMAIL_FROM: test@example.com
|
||||
# PSONO_ACTIVATION_LINK_SECRET: 9SruC2qPmKScVzGaF4378LW4rvNNkK2G3Gddqy9kPQqgkjeDQjs7jaLBCstgtJTt
|
||||
# PSONO_SECRET_KEY: RQTKawYQv4w6KkuphcLzLu7r5ap7xE5DSDu5SkKXjMnWBQ93mcMKjdZfeZkY2Y7C
|
||||
# services:
|
||||
# - docker:18-dind
|
||||
# script:
|
||||
# - docker info
|
||||
# - echo $CI_JOB_TOKEN | docker login --username=gitlab-ci-token --password-stdin registry.gitlab.com
|
||||
# - echo $artifactory_credentials | docker login --username=gitlab --password-stdin psono-docker.jfrog.io
|
||||
# - echo $docker_hub_credentials | docker login --username=psonogitlab --password-stdin
|
||||
# - sh ./var/update_version.sh
|
||||
# - docker build -f DockerfileCentos7 -t centos7-testimage --pull .
|
||||
# - docker run -d --name db postgres:9.6.16
|
||||
# - sleep 20
|
||||
# - docker run --link db:postgres centos7-testimage bash -c "yum -y install python36u-pip && pip3.6 install -r requirements-dev.txt && pip3.6 install mypy && python3.6 /usr/bin/mypy -p psono --ignore-missing-imports && python3.6 ./psono/manage.py migrate && python3.6 ./psono/manage.py test --parallel=8 restapi.tests cron.tests"
|
||||
|
||||
|
||||
run-vulnerability-scan:
|
||||
except:
|
||||
- schedules
|
||||
stage: test
|
||||
image: psono-docker.jfrog.io/docker:19.03.8-git
|
||||
image: psono-docker.jfrog.io/docker:20.10.17-git
|
||||
services:
|
||||
- docker:18-dind
|
||||
- name: docker:20-dind
|
||||
alias: docker
|
||||
command: ["--tls=false"]
|
||||
variables:
|
||||
DOCKER_DRIVER: overlay2
|
||||
DOCKER_HOST: tcp://docker:2375/
|
||||
DOCKER_TLS_CERTDIR: ""
|
||||
script:
|
||||
- docker info
|
||||
- echo $CI_JOB_TOKEN | docker login --username=gitlab-ci-token --password-stdin registry.gitlab.com
|
||||
@ -133,9 +126,15 @@ run-vulnerability-scan:
|
||||
# except:
|
||||
# - schedules
|
||||
# stage: deploy
|
||||
# image: psono-docker.jfrog.io/docker:19.03.8-git
|
||||
# image: psono-docker.jfrog.io/docker:20.10.17-git
|
||||
# services:
|
||||
# - docker:18-dind
|
||||
# - name: docker:20-dind
|
||||
# alias: docker
|
||||
# command: ["--tls=false"]
|
||||
# variables:
|
||||
# DOCKER_DRIVER: overlay2
|
||||
# DOCKER_HOST: tcp://docker:2375/
|
||||
# DOCKER_TLS_CERTDIR: ""
|
||||
# script:
|
||||
# - docker info
|
||||
# - echo $CI_JOB_TOKEN | docker login --username=gitlab-ci-token --password-stdin registry.gitlab.com
|
||||
@ -149,9 +148,15 @@ release-container:
|
||||
except:
|
||||
- schedules
|
||||
stage: release
|
||||
image: psono-docker.jfrog.io/docker:19.03.8-git
|
||||
image: psono-docker.jfrog.io/docker:20.10.17-git
|
||||
services:
|
||||
- docker:18-dind
|
||||
- name: docker:20-dind
|
||||
alias: docker
|
||||
command: ["--tls=false"]
|
||||
variables:
|
||||
DOCKER_DRIVER: overlay2
|
||||
DOCKER_HOST: tcp://docker:2375/
|
||||
DOCKER_TLS_CERTDIR: ""
|
||||
script:
|
||||
- docker info
|
||||
- echo $CI_JOB_TOKEN | docker login --username=gitlab-ci-token --password-stdin registry.gitlab.com
|
||||
@ -167,7 +172,7 @@ release-version-bump:
|
||||
except:
|
||||
- schedules
|
||||
stage: release
|
||||
image: psono-docker.jfrog.io/docker:19.03.8-git
|
||||
image: psono-docker.jfrog.io/docker:20.10.17-git
|
||||
script:
|
||||
- mkdir -p /root/.ssh
|
||||
- echo "$github_deploy_key" > /root/.ssh/id_rsa
|
||||
@ -191,9 +196,15 @@ deploy:
|
||||
except:
|
||||
- schedules
|
||||
stage: deploy
|
||||
image: psono-docker.jfrog.io/docker:19.03.8-git
|
||||
image: psono-docker.jfrog.io/docker:20.10.17-git
|
||||
services:
|
||||
- docker:18-dind
|
||||
- name: docker:20-dind
|
||||
alias: docker
|
||||
command: ["--tls=false"]
|
||||
variables:
|
||||
DOCKER_DRIVER: overlay2
|
||||
DOCKER_HOST: tcp://docker:2375/
|
||||
DOCKER_TLS_CERTDIR: ""
|
||||
script:
|
||||
- docker info
|
||||
- echo $CI_JOB_TOKEN | docker login --username=gitlab-ci-token --password-stdin registry.gitlab.com
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# PSONO Dockerfile for Alpine
|
||||
FROM psono-docker.jfrog.io/python:3.8-alpine3.13
|
||||
FROM psono-docker.jfrog.io/python:3.10.4-alpine3.16
|
||||
|
||||
LABEL maintainer="Sascha Pfeiffer <sascha.pfeiffer@psono.com>"
|
||||
COPY . /root/
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# PSONO Dockerfile for Ubuntu 20.04
|
||||
FROM psono-docker.jfrog.io/ubuntu:20.04
|
||||
# PSONO Dockerfile for Ubuntu 22.04
|
||||
FROM psono-docker.jfrog.io/ubuntu:22.04
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
LABEL maintainer="Sascha Pfeiffer <sascha.pfeiffer@psono.com>"
|
||||
COPY . /root/
|
||||
@ -21,7 +21,6 @@ RUN mkdir -p /root/.pip && \
|
||||
python3-psycopg2 \
|
||||
postgresql-client && \
|
||||
pip3 install -r requirements.txt && \
|
||||
pip3 install uwsgi && \
|
||||
mkdir -p /root/.psono_fileserver && \
|
||||
cp /root/configs/mainconfig/settings.yaml /root/.psono_fileserver/settings.yaml && \
|
||||
sed -i s,path/to/psono-fileserver,root,g /root/.psono_fileserver/settings.yaml && \
|
||||
@ -7,7 +7,7 @@ markdown==3.0.1
|
||||
django-filter==2.4.0
|
||||
PyYAML==5.4.1
|
||||
more-itertools==5.0.0
|
||||
pynacl==1.3.0
|
||||
PyNaCl==1.5.0
|
||||
django-redis==4.10.0
|
||||
ntplib==0.3.4
|
||||
python-dateutil==2.7.5
|
||||
|
||||
@ -331,7 +331,7 @@ certifi==2021.10.8
|
||||
# via
|
||||
# msrest
|
||||
# requests
|
||||
cffi==1.14.4
|
||||
cffi==1.15.1
|
||||
# via
|
||||
# azure-datalake-store
|
||||
# bcrypt
|
||||
@ -524,7 +524,7 @@ pyjwt[crypto]==2.4.0
|
||||
# via
|
||||
# adal
|
||||
# django-allauth
|
||||
pynacl==1.3.0
|
||||
pynacl==1.5.0
|
||||
# via
|
||||
# -r requirements.in
|
||||
# paramiko
|
||||
@ -537,7 +537,7 @@ python-dateutil==2.7.5
|
||||
# botocore
|
||||
python3-openid==3.2.0
|
||||
# via django-allauth
|
||||
pytz==2020.1
|
||||
pytz==2022.1
|
||||
# via
|
||||
# django
|
||||
# djangorestframework
|
||||
@ -570,7 +570,7 @@ rsa==4.6
|
||||
# via google-auth
|
||||
s3transfer==0.5.0
|
||||
# via boto3
|
||||
six==1.15.0
|
||||
six==1.16.0
|
||||
# via
|
||||
# bcrypt
|
||||
# cryptography
|
||||
@ -583,7 +583,6 @@ six==1.15.0
|
||||
# more-itertools
|
||||
# msrestazure
|
||||
# protobuf
|
||||
# pynacl
|
||||
# python-dateutil
|
||||
sqlparse==0.4.2
|
||||
# via django
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user