fix: add missing build dependencies for cryptography (#22)

This commit is contained in:
Robert Kaussow 2021-02-18 10:08:54 +01:00 committed by GitHub
parent 088e864aad
commit 2946e7268e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 30 deletions

View File

@ -1,7 +1,6 @@
local PythonVersion(pyversion='3.6') = { local PythonVersion(pyversion='3.6') = {
name: 'python' + std.strReplace(pyversion, '.', '') + '-pytest', name: 'python' + std.strReplace(pyversion, '.', '') + '-pytest',
image: 'python:' + pyversion, image: 'python:' + pyversion,
pull: 'always',
environment: { environment: {
PY_COLORS: 1, PY_COLORS: 1,
}, },
@ -40,7 +39,6 @@ local PipelineLint = {
{ {
name: 'flake8', name: 'flake8',
image: 'python:3.9', image: 'python:3.9',
pull: 'always',
environment: { environment: {
PY_COLORS: 1, PY_COLORS: 1,
}, },
@ -77,12 +75,12 @@ local PipelineTest = {
PythonVersion(pyversion='3.8'), PythonVersion(pyversion='3.8'),
PythonVersion(pyversion='3.9'), PythonVersion(pyversion='3.9'),
], ],
trigger: {
ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
},
depends_on: [ depends_on: [
'lint', 'lint',
], ],
trigger: {
ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
},
}; };
local PipelineSecurity = { local PipelineSecurity = {
@ -96,7 +94,6 @@ local PipelineSecurity = {
{ {
name: 'bandit', name: 'bandit',
image: 'python:3.9', image: 'python:3.9',
pull: 'always',
environment: { environment: {
PY_COLORS: 1, PY_COLORS: 1,
}, },
@ -189,10 +186,11 @@ local PipelineBuildContainer(arch='amd64') = {
steps: [ steps: [
{ {
name: 'build', name: 'build',
image: 'python:3.9', image: 'python:3.9-alpine',
pull: 'always',
commands: [ commands: [
'apk --update --quiet add build-base libffi-dev musl-dev libressl-dev python3-dev cargo git',
'git fetch -tq', 'git fetch -tq',
'pip install --upgrade --no-cache-dir pip',
'pip install poetry poetry-dynamic-versioning -qq', 'pip install poetry poetry-dynamic-versioning -qq',
'poetry build', 'poetry build',
], ],
@ -200,18 +198,17 @@ local PipelineBuildContainer(arch='amd64') = {
{ {
name: 'dryrun', name: 'dryrun',
image: 'thegeeklab/drone-docker:19', image: 'thegeeklab/drone-docker:19',
pull: 'always',
settings: { settings: {
dry_run: true, dry_run: true,
dockerfile: 'docker/Dockerfile.' + arch, dockerfile: 'docker/Dockerfile.' + arch,
repo: 'thegeeklab/git-batch', repo: 'thegeeklab/${DRONE_REPO_NAME}',
username: { from_secret: 'docker_username' }, username: { from_secret: 'docker_username' },
password: { from_secret: 'docker_password' }, password: { from_secret: 'docker_password' },
}, },
depends_on: ['build'],
when: { when: {
ref: ['refs/pull/**'], ref: ['refs/pull/**'],
}, },
depends_on: ['build'],
}, },
{ {
name: 'publish-dockerhub', name: 'publish-dockerhub',
@ -293,6 +290,7 @@ local PipelineNotifications = {
}, },
{ {
name: 'pushrm-dockerhub', name: 'pushrm-dockerhub',
pull: 'always',
image: 'chko/docker-pushrm:1', image: 'chko/docker-pushrm:1',
environment: { environment: {
DOCKER_PASS: { DOCKER_PASS: {
@ -311,6 +309,7 @@ local PipelineNotifications = {
}, },
{ {
name: 'pushrm-quay', name: 'pushrm-quay',
pull: 'always',
image: 'chko/docker-pushrm:1', image: 'chko/docker-pushrm:1',
environment: { environment: {
APIKEY__QUAY_IO: { APIKEY__QUAY_IO: {

View File

@ -18,7 +18,6 @@ steps:
PY_COLORS: 1 PY_COLORS: 1
- name: flake8 - name: flake8
pull: always
image: python:3.9 image: python:3.9
commands: commands:
- git fetch -tq - git fetch -tq
@ -49,7 +48,6 @@ steps:
- git fetch -tq - git fetch -tq
- name: python36-pytest - name: python36-pytest
pull: always
image: python:3.6 image: python:3.6
commands: commands:
- pip install poetry poetry-dynamic-versioning -qq - pip install poetry poetry-dynamic-versioning -qq
@ -62,7 +60,6 @@ steps:
- fetch - fetch
- name: python37-pytest - name: python37-pytest
pull: always
image: python:3.7 image: python:3.7
commands: commands:
- pip install poetry poetry-dynamic-versioning -qq - pip install poetry poetry-dynamic-versioning -qq
@ -75,7 +72,6 @@ steps:
- fetch - fetch
- name: python38-pytest - name: python38-pytest
pull: always
image: python:3.8 image: python:3.8
commands: commands:
- pip install poetry poetry-dynamic-versioning -qq - pip install poetry poetry-dynamic-versioning -qq
@ -88,7 +84,6 @@ steps:
- fetch - fetch
- name: python39-pytest - name: python39-pytest
pull: always
image: python:3.9 image: python:3.9
commands: commands:
- pip install poetry poetry-dynamic-versioning -qq - pip install poetry poetry-dynamic-versioning -qq
@ -119,7 +114,6 @@ platform:
steps: steps:
- name: bandit - name: bandit
pull: always
image: python:3.9 image: python:3.9
commands: commands:
- git fetch -tq - git fetch -tq
@ -208,22 +202,22 @@ platform:
steps: steps:
- name: build - name: build
pull: always image: python:3.9-alpine
image: python:3.9
commands: commands:
- apk --update --quiet add build-base libffi-dev musl-dev libressl-dev python3-dev cargo git
- git fetch -tq - git fetch -tq
- pip install --upgrade --no-cache-dir pip
- pip install poetry poetry-dynamic-versioning -qq - pip install poetry poetry-dynamic-versioning -qq
- poetry build - poetry build
- name: dryrun - name: dryrun
pull: always
image: thegeeklab/drone-docker:19 image: thegeeklab/drone-docker:19
settings: settings:
dockerfile: docker/Dockerfile.amd64 dockerfile: docker/Dockerfile.amd64
dry_run: true dry_run: true
password: password:
from_secret: docker_password from_secret: docker_password
repo: thegeeklab/git-batch repo: thegeeklab/${DRONE_REPO_NAME}
username: username:
from_secret: docker_username from_secret: docker_username
when: when:
@ -288,22 +282,22 @@ platform:
steps: steps:
- name: build - name: build
pull: always image: python:3.9-alpine
image: python:3.9
commands: commands:
- apk --update --quiet add build-base libffi-dev musl-dev libressl-dev python3-dev cargo git
- git fetch -tq - git fetch -tq
- pip install --upgrade --no-cache-dir pip
- pip install poetry poetry-dynamic-versioning -qq - pip install poetry poetry-dynamic-versioning -qq
- poetry build - poetry build
- name: dryrun - name: dryrun
pull: always
image: thegeeklab/drone-docker:19 image: thegeeklab/drone-docker:19
settings: settings:
dockerfile: docker/Dockerfile.arm64 dockerfile: docker/Dockerfile.arm64
dry_run: true dry_run: true
password: password:
from_secret: docker_password from_secret: docker_password
repo: thegeeklab/git-batch repo: thegeeklab/${DRONE_REPO_NAME}
username: username:
from_secret: docker_username from_secret: docker_username
when: when:
@ -368,22 +362,22 @@ platform:
steps: steps:
- name: build - name: build
pull: always image: python:3.9-alpine
image: python:3.9
commands: commands:
- apk --update --quiet add build-base libffi-dev musl-dev libressl-dev python3-dev cargo git
- git fetch -tq - git fetch -tq
- pip install --upgrade --no-cache-dir pip
- pip install poetry poetry-dynamic-versioning -qq - pip install poetry poetry-dynamic-versioning -qq
- poetry build - poetry build
- name: dryrun - name: dryrun
pull: always
image: thegeeklab/drone-docker:19 image: thegeeklab/drone-docker:19
settings: settings:
dockerfile: docker/Dockerfile.arm dockerfile: docker/Dockerfile.arm
dry_run: true dry_run: true
password: password:
from_secret: docker_password from_secret: docker_password
repo: thegeeklab/git-batch repo: thegeeklab/${DRONE_REPO_NAME}
username: username:
from_secret: docker_username from_secret: docker_username
when: when:
@ -476,6 +470,7 @@ steps:
- success - success
- name: pushrm-dockerhub - name: pushrm-dockerhub
pull: always
image: chko/docker-pushrm:1 image: chko/docker-pushrm:1
environment: environment:
DOCKER_PASS: DOCKER_PASS:
@ -490,6 +485,7 @@ steps:
- success - success
- name: pushrm-quay - name: pushrm-quay
pull: always
image: chko/docker-pushrm:1 image: chko/docker-pushrm:1
environment: environment:
APIKEY__QUAY_IO: APIKEY__QUAY_IO:
@ -533,6 +529,6 @@ depends_on:
--- ---
kind: signature kind: signature
hmac: c1bacd19c919a65a0fc3439efa332e269e4b90ba9b2a31610f2abb39e640709a hmac: 3aab823250dbdf8f5078e4239f40bfa472c425f8bf61ffef87650cfcf88629c2
... ...