Merge branch 'master' into apple-silicon

openedx-unsupported · Apr 27, 2022 · 67d1ac2 · 67d1ac2
2 parents aab6457 + 3906411
commit 67d1ac2
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -227,20 +227,22 @@ impl-dev.provision.%: dev.check-memory ## Provision specified services.
 dev.provision.%: ## Provision specified services.
 	@scripts/send_metrics.py wrap "dev.provision.$*"
 
-dev.backup: dev.up.mysql57+mongo+elasticsearch+elasticsearch7+elasticsearch710+coursegraph ## Write all data volumes to the host.
+dev.backup: dev.up.mysql57+mongo+elasticsearch+elasticsearch7+elasticsearch710+opensearch12+coursegraph ## Write all data volumes to the host.
 	docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.mysql57) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/mysql57.tar.gz /var/lib/mysql
 	docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.mongo) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/mongo.tar.gz /data/db
 	docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.elasticsearch) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/elasticsearch.tar.gz /usr/share/elasticsearch/data
 	docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.elasticsearch7) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/elasticsearch7.tar.gz /usr/share/elasticsearch/data
 	docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.elasticsearch710) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/elasticsearch710.tar.gz /usr/share/elasticsearch/data
+	docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.opensearch12) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/opensearch12.tar.gz /usr/share/opensearch/data
 	docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.coursegraph) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/coursegraph.tar.gz /data
 
-dev.restore: dev.up.mysql57+mongo+elasticsearch+elasticsearch7+elasticsearch710+coursegraph ## Restore all data volumes from the host. WILL OVERWRITE ALL EXISTING DATA!
+dev.restore: dev.up.mysql57+mongo+elasticsearch+elasticsearch7+elasticsearch710+opensearch12+coursegraph ## Restore all data volumes from the host. WILL OVERWRITE ALL EXISTING DATA!
 	docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.mysql57) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/mysql57.tar.gz
 	docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.mongo) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/mongo.tar.gz
 	docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.elasticsearch) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/elasticsearch.tar.gz
 	docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.elasticsearch7) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/elasticsearch7.tar.gz
 	docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.elasticsearch710) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/elasticsearch710.tar.gz
+	docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.opensearch12) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/opensearch12.tar.gz
 	docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.coursegraph) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/coursegraph.tar.gz
 
 # List of Makefile targets to run database migrations, in the form dev.migrate.$(service)

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -118,6 +118,25 @@ services:
       - bootstrap.memory_lock=true
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
 
+  # This is meant to be used to test OS upgrades.
+  opensearch12:
+    container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.opensearch12"
+    hostname: opensearch12.devstack.edx
+    image: opensearchproject/opensearch:1.2.0
+    networks:
+      default:
+        aliases:
+          - edx.devstack.opensearch12
+    ports:
+      - "9202:9200"
+      - "9600:9600"
+    volumes:
+      - opensearch12_data:/usr/share/opensearch/data
+    environment:
+      - discovery.type=single-node
+      - bootstrap.memory_lock=true
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+
   firefox:
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.firefox"
     hostname: firefox.devstack.edx
@@ -396,6 +415,7 @@ services:
       - memcached
       - mongo
       - elasticsearch710
+      - opensearch12
     image: edxops/forum:${OPENEDX_RELEASE:-latest}
     stdin_open: true
     tty: true
@@ -418,6 +438,7 @@ services:
       - memcached
       - mongo
       - mysql57
+      - opensearch12
     # Allows attachment to the LMS service using 'docker attach <containerID>'.
     stdin_open: true
     tty: true
@@ -577,6 +598,7 @@ services:
       - memcached
       - mongo
       - mysql57
+      - opensearch12
     # Allows attachment to the Studio service using 'docker attach <containerID>'.
     stdin_open: true
     tty: true
@@ -814,4 +836,5 @@ volumes:
   elasticsearch7_data:
   elasticsearch710_data:
   mongo_data:
+  opensearch12_data:
   mysql57_data:
diff --git a/options.mk b/options.mk
@@ -90,4 +90,4 @@ credentials+discovery+ecommerce+insights+lms+registrar+studio
 # All third-party services.
 # Separated by plus signs. Listed in alphabetical order for clarity.
 THIRD_PARTY_SERVICES ?= \
-chrome+coursegraph+devpi+elasticsearch+elasticsearch7+elasticsearch710+firefox+memcached+mongo+mysql57+redis+namenode+datanode+resourcemanager+nodemanager+sparkmaster+sparkworker+vertica
+chrome+coursegraph+devpi+elasticsearch+elasticsearch7+elasticsearch710+firefox+memcached+mongo+mysql57+opensearch12+redis+namenode+datanode+resourcemanager+nodemanager+sparkmaster+sparkworker+vertica
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -17,7 +17,7 @@ cffi==1.15.0
     #   pynacl
 charset-normalizer==2.0.12
     # via requests
-cryptography==36.0.2
+cryptography==37.0.0
     # via paramiko
 distro==1.7.0
     # via docker-compose
@@ -33,7 +33,7 @@ idna==3.3
     # via requests
 jsonschema==3.2.0
     # via docker-compose
-paramiko==2.10.3
+paramiko==2.10.4
     # via docker
 pycparser==2.21
     # via cffi

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -36,7 +36,7 @@ click==8.1.2
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-cryptography==36.0.2
+cryptography==37.0.0
     # via
     #   -r requirements/base.txt
     #   -r requirements/test.txt
@@ -90,7 +90,7 @@ packaging==21.3
     #   -r requirements/test.txt
     #   pytest
     #   tox
-paramiko==2.10.3
+paramiko==2.10.4
     # via
     #   -r requirements/base.txt
     #   -r requirements/test.txt
@@ -138,7 +138,7 @@ pyrsistent==0.18.1
     #   -r requirements/base.txt
     #   -r requirements/test.txt
     #   jsonschema
-pytest==7.1.1
+pytest==7.1.2
     # via -r requirements/test.txt
 python-dotenv==0.20.0
     # via

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -10,7 +10,7 @@ attrs==21.4.0
     # via
     #   -r requirements/base.txt
     #   jsonschema
-babel==2.9.1
+babel==2.10.1
     # via sphinx
 bcrypt==3.2.0
     # via
@@ -32,7 +32,7 @@ charset-normalizer==2.0.12
     # via
     #   -r requirements/base.txt
     #   requests
-cryptography==36.0.2
+cryptography==37.0.0
     # via
     #   -r requirements/base.txt
     #   paramiko
@@ -82,7 +82,7 @@ markupsafe==2.1.1
     # via jinja2
 packaging==21.3
     # via sphinx
-paramiko==2.10.3
+paramiko==2.10.4
     # via
     #   -r requirements/base.txt
     #   docker
@@ -92,7 +92,7 @@ pycparser==2.21
     # via
     #   -r requirements/base.txt
     #   cffi
-pygments==2.11.2
+pygments==2.12.0
     # via
     #   doc8
     #   readme-renderer

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -27,7 +27,7 @@ charset-normalizer==2.0.12
     # via
     #   -r requirements/base.txt
     #   requests
-cryptography==36.0.2
+cryptography==37.0.0
     # via
     #   -r requirements/base.txt
     #   paramiko
@@ -61,7 +61,7 @@ jsonschema==3.2.0
     #   docker-compose
 packaging==21.3
     # via pytest
-paramiko==2.10.3
+paramiko==2.10.4
     # via
     #   -r requirements/base.txt
     #   docker
@@ -87,7 +87,7 @@ pyrsistent==0.18.1
     # via
     #   -r requirements/base.txt
     #   jsonschema
-pytest==7.1.1
+pytest==7.1.2
     # via -r requirements/test.in
 python-dotenv==0.20.0
     # via