This commit is contained in:
Mathieu Pillard 2023-05-15 14:51:24 +02:00 коммит произвёл GitHub
Родитель 691d91e2e3
Коммит 7730f6f3bb
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
7 изменённых файлов: 13 добавлений и 70 удалений

Просмотреть файл

@ -290,12 +290,6 @@ references:
MYSQL_DATABASE: olympia MYSQL_DATABASE: olympia
defaults: &defaults defaults: &defaults
parameters:
djangoversion:
type: string
default: django42
environment:
DJANGO_VERSION : << parameters.djangoversion >>
working_directory: &working-directory working_directory: &working-directory
docker: docker:
- image: *python - image: *python
@ -373,7 +367,7 @@ commands:
command: | command: |
docker version docker version
docker login -u "${DOCKERHUB_USER}" -p "${DOCKERHUB_PASS}" docker login -u "${DOCKERHUB_USER}" -p "${DOCKERHUB_PASS}"
docker build -t app:build --build-arg DJANGO_VERSION --label git.commit="$CIRCLE_SHA1" . docker build -t app:build --label git.commit="$CIRCLE_SHA1" .
docker tag app:build "${DOCKERHUB_REPO}":<< parameters.image_tag >> docker tag app:build "${DOCKERHUB_REPO}":<< parameters.image_tag >>
docker push "${DOCKERHUB_REPO}":<< parameters.image_tag >> docker push "${DOCKERHUB_REPO}":<< parameters.image_tag >>
@ -647,8 +641,6 @@ jobs:
release-master: release-master:
<<: *defaults-release <<: *defaults-release
environment:
DJANGO_VERSION: django42
steps: steps:
- checkout - checkout
- make_release: - make_release:
@ -665,50 +657,15 @@ workflows:
version: 2 version: 2
default-workflow: default-workflow:
jobs: jobs:
- addons-versions-files-ratings: - addons-versions-files-ratings
matrix: - amo-lib-locales-and-signing
parameters: - assets
djangoversion:
- django32
- django42
- amo-lib-locales-and-signing:
matrix:
parameters:
djangoversion:
- django32
- django42
- assets:
matrix:
parameters:
djangoversion:
- django32
- django42
- codestyle - codestyle
- devhub: - devhub
matrix:
parameters:
djangoversion:
- django32
- django42
- docs - docs
- main: - main
matrix: - reviewers-and-zadmin
parameters: - es-tests
djangoversion:
- django32
- django42
- reviewers-and-zadmin:
matrix:
parameters:
djangoversion:
- django32
- django42
- es-tests:
matrix:
parameters:
djangoversion:
- django32
- django42
- release-master: - release-master:
filters: filters:
branches: branches:

Просмотреть файл

@ -1,8 +1,5 @@
FROM python:3.10-slim-buster FROM python:3.10-slim-buster
ARG DJANGO_VERSION=django42
ENV DJANGO_VERSION=$DJANGO_VERSION
# Should change it to use ARG instead of ENV for OLYMPIA_UID/OLYMPIA_GID # Should change it to use ARG instead of ENV for OLYMPIA_UID/OLYMPIA_GID
# once the jenkins server is upgraded to support docker >= v1.9.0 # once the jenkins server is upgraded to support docker >= v1.9.0
ENV OLYMPIA_UID=9500 \ ENV OLYMPIA_UID=9500 \

Просмотреть файл

@ -1,5 +1,4 @@
export PYTHON_COMMAND=python3 export PYTHON_COMMAND=python3
export DJANGO_VERSION?=django42
# As we're using user-local installs inside the docker-container we need # As we're using user-local installs inside the docker-container we need
# to be cautious about uprading pip and not confusing it with the # to be cautious about uprading pip and not confusing it with the
@ -87,10 +86,8 @@ install_python_codestyle_dependencies:
.PHONY: install_python_test_dependencies .PHONY: install_python_test_dependencies
install_python_test_dependencies: install_python_test_dependencies:
# Can't use --progress-bar=off for system packages as long as our docker image $(PIP_COMMAND) install --progress-bar=off --no-deps --exists-action=w -r requirements/system.txt
# doesn't have pip 10 by default. $(PIP_COMMAND) install --progress-bar=off --no-deps --exists-action=w -r requirements/prod.txt
$(PIP_COMMAND) install --no-deps --exists-action=w -r requirements/system.txt
$(PIP_COMMAND) install --progress-bar=off --no-deps --exists-action=w -r requirements/prod_$(DJANGO_VERSION).txt
$(PIP_COMMAND) install --progress-bar=off --no-deps --exists-action=w -r requirements/tests.txt $(PIP_COMMAND) install --progress-bar=off --no-deps --exists-action=w -r requirements/tests.txt
.PHONY: install_python_dev_dependencies .PHONY: install_python_dev_dependencies

Просмотреть файл

@ -5,7 +5,6 @@ x-env-mapping: &env
- CELERY_BROKER_URL=amqp://olympia:olympia@rabbitmq/olympia - CELERY_BROKER_URL=amqp://olympia:olympia@rabbitmq/olympia
- CELERY_RESULT_BACKEND=redis://redis:6379/1 - CELERY_RESULT_BACKEND=redis://redis:6379/1
- DATABASES_DEFAULT_URL=mysql://root:@mysqld/olympia - DATABASES_DEFAULT_URL=mysql://root:@mysqld/olympia
- DJANGO_VERSION=django32
- ELASTICSEARCH_LOCATION=elasticsearch:9200 - ELASTICSEARCH_LOCATION=elasticsearch:9200
- MEMCACHE_LOCATION=memcached:11211 - MEMCACHE_LOCATION=memcached:11211
- MYSQL_DATABASE=olympia - MYSQL_DATABASE=olympia

Просмотреть файл

@ -341,6 +341,9 @@ dennis==1.1.0 \
Deprecated==1.2.13 \ Deprecated==1.2.13 \
--hash=sha256:64756e3e14c8c5eea9795d93c524551432a0be75629f8f29e67ab8caf076c76d \ --hash=sha256:64756e3e14c8c5eea9795d93c524551432a0be75629f8f29e67ab8caf076c76d \
--hash=sha256:43ac5335da90c31c24ba028af536a91d41d53f9e6901ddb021bcc572ce44e38d --hash=sha256:43ac5335da90c31c24ba028af536a91d41d53f9e6901ddb021bcc572ce44e38d
Django==4.2.1 \
--hash=sha256:7efa6b1f781a6119a10ac94b4794ded90db8accbe7802281cd26f8664ffed59c \
--hash=sha256:066b6debb5ac335458d2a713ed995570536c8b59a580005acb0732378d5eb1ee
django-aesfield==4.0.0 \ django-aesfield==4.0.0 \
--hash=sha256:2c88e7dc063919c4fa2fba6d7c65eb7be05838323ca3adcce76fb687d30d630b \ --hash=sha256:2c88e7dc063919c4fa2fba6d7c65eb7be05838323ca3adcce76fb687d30d630b \
--hash=sha256:425b5c0ed6d96045af8b47230dd5870a12cf3feb7a9c601878c82ebaf409cdce --hash=sha256:425b5c0ed6d96045af8b47230dd5870a12cf3feb7a9c601878c82ebaf409cdce

Просмотреть файл

@ -1,5 +0,0 @@
-r prod.txt
Django==3.2.19 \
--hash=sha256:031365bae96814da19c10706218c44dff3b654cc4de20a98bd2d29b9bde469f0 \
--hash=sha256:21cc991466245d659ab79cb01204f9515690f8dae00e5eabde307f14d24d4d7d

Просмотреть файл

@ -1,5 +0,0 @@
-r prod.txt
Django==4.2.1 \
--hash=sha256:7efa6b1f781a6119a10ac94b4794ded90db8accbe7802281cd26f8664ffed59c \
--hash=sha256:066b6debb5ac335458d2a713ed995570536c8b59a580005acb0732378d5eb1ee