fix(armv7): upgrade setuptools and cryptography

!3
This commit is contained in:
2023-05-11 09:06:00 +09:30
parent e59e84afba
commit a0d89d1ef1
2 changed files with 40 additions and 3 deletions

View File

@ -2,7 +2,7 @@
variables:
GIT_SUBMODULE_STRATEGY: recursive
MY_PROJECT_ID: "45741845"
DOCKER_TARGET_PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7 #linux/arm/v6
DOCKER_TARGET_PLATFORMS: linux/amd64,linux/arm64 #,linux/arm/v7 #linux/arm/v6
DOCKER_CREATED_IMAGE_NAME: ansible-ee
@ -25,6 +25,19 @@ include:
- conventional_commits/.gitlab-ci.yml
- gitlab_release/.gitlab-ci.yml
- git_push_mirror/.gitlab-ci.yml
- template: Jobs/Container-Scanning.gitlab-ci.yml # see https://gitlab.com/gitlab-org/gitlab/-/issues/381665
container_scanning:
variables:
CS_DEFAULT_BRANCH_IMAGE: $CI_REGISTRY_IMAGE/$DOCKER_CREATED_IMAGE_NAME:$CI_COMMIT_SHA
needs: [ "Docker Container" ]
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
when: never
- when: on_success
# docker:23
# docker pull docker/buildx-bin:0.10.4
@ -199,7 +212,7 @@ Docker Hub:
- if: '$CI_COMMIT_BRANCH != "master"'
allow_failure: true
#when: manual
when: always
when: on_success
- when: never

View File

@ -56,6 +56,13 @@ RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get install --no-install-recommends -y \
openssh-client \
git \
# && apt-get install --reinstall --no-install-recommends -yq \
# build-essential \
# libssl-dev \
# libffi-dev \
# python3-dev \
# cargo \
# pkg-config \
# End of Black Magic
&& rm -rf /var/lib/apt/lists/* \
&& mkdir -p /etc/ansible/roles \
@ -67,9 +74,26 @@ WORKDIR /workdir
COPY ansible.cfg /etc/ansible/ansible.cfg
# # see: https://github.com/pyca/cryptography/blob/998e86659ae750562ecc0bcf0eabd1828fd5c9ed/docs/installation.rst#debianubuntu
# RUN export DEBIAN_FRONTEND=noninteractive \
# && apt update \
# && apt-get install --reinstall --no-install-recommends -yq \
# build-essential \
# libssl-dev \
# libffi-dev \
# python3-dev \
# cargo \
# pkg-config
RUN pip install --upgrade pip \
&& pip install \
&& pip install --upgrade \
setuptools \
wheel
#setuptools-rust
RUN pip install \
ansible-core==2.14.5 \
ansible-lint==6.15.0