From 80eca8aa676e09e431f7f67d39c2444ada0491d7 Mon Sep 17 00:00:00 2001 From: Van Go <35277477+van-go@users.noreply.github.com> Date: Mon, 10 Jul 2023 16:05:41 -0500 Subject: [PATCH 1/4] des-2509-sim-type-missing-in-pub-pipeline --- conf/docker/docker-compose-dev.all.debug.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/conf/docker/docker-compose-dev.all.debug.yml b/conf/docker/docker-compose-dev.all.debug.yml index 9a3b98d85..9efb1b0b7 100644 --- a/conf/docker/docker-compose-dev.all.debug.yml +++ b/conf/docker/docker-compose-dev.all.debug.yml @@ -4,6 +4,7 @@ version: "3" services: redis: image: redis:4.0 + platform: "linux/amd64" volumes: - redis_data:/data - ../redis.conf:/usr/local/etc/redis/redis.conf @@ -14,7 +15,7 @@ services: hostname: des_redis rabbitmq: - image: rabbitmq:3.6.10-management + image: arm64v8/rabbitmq:3.6.14-management volumes: - rabbitmq_data:/var/lib/rabbitmq/mnesia/rabbit@des_rabbitmq - ../rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf @@ -29,11 +30,13 @@ services: memcached: image: memcached:latest + platform: "linux/amd64" container_name: des_memcached hostname: des_memcached elasticsearch: image: docker.elastic.co/elasticsearch/elasticsearch:7.4.0 + platform: "linux/amd64" ulimits: memlock: -1 environment: @@ -49,17 +52,19 @@ services: mysql: image: mysql:5.6 + platform: "linux/amd64" volumes: - mysql_data:/var/lib/mysql - ../mysql.cnf:/etc/mysql/conf.d/mysql.cnf env_file: ../env_files/mysql.env ports: - - 127.0.0.1:3306:3306 + - 127.0.0.1:3306:3306 container_name: des_mysql hostname: des_mysql nginx: image: nginx + platform: "linux/amd64" volumes: - ../nginx/nginx.debug.conf:/etc/nginx/nginx.conf - ../nginx/gzip.conf:/etc/nginx/gzip.conf @@ -130,3 +135,4 @@ volumes: es_data: rabbitmq_data: sockets: + From 4397a9b109257a823995e9f3d490d8e538acdd45 Mon Sep 17 00:00:00 2001 From: Van Go <35277477+van-go@users.noreply.github.com> Date: Fri, 14 Jul 2023 16:12:48 -0500 Subject: [PATCH 2/4] file change --- .../pipeline-selection/pipeline-selection-sim.template.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designsafe/static/scripts/data-depot/components/projects/pipeline-selection/pipeline-selection-sim.template.html b/designsafe/static/scripts/data-depot/components/projects/pipeline-selection/pipeline-selection-sim.template.html index cee88abf5..a3c76f564 100644 --- a/designsafe/static/scripts/data-depot/components/projects/pipeline-selection/pipeline-selection-sim.template.html +++ b/designsafe/static/scripts/data-depot/components/projects/pipeline-selection/pipeline-selection-sim.template.html @@ -127,10 +127,10 @@

Simulation Type
- {{ simulation.value.experimentType.replace('_', ' ') }} + {{ simulation.value.simulationType.replace('_', ' ') }} - {{ simulation.value.experimentTypeOther }} + {{ simulation.value.simulationTypeOther }}
From abc16dceb286fbd457cb67db5d4131dc410a8eb0 Mon Sep 17 00:00:00 2001 From: Van Go <35277477+van-go@users.noreply.github.com> Date: Fri, 14 Jul 2023 16:13:16 -0500 Subject: [PATCH 3/4] Delete docker-compose-dev.all.debug.yml wrong file --- conf/docker/docker-compose-dev.all.debug.yml | 138 ------------------- 1 file changed, 138 deletions(-) delete mode 100644 conf/docker/docker-compose-dev.all.debug.yml diff --git a/conf/docker/docker-compose-dev.all.debug.yml b/conf/docker/docker-compose-dev.all.debug.yml deleted file mode 100644 index 9efb1b0b7..000000000 --- a/conf/docker/docker-compose-dev.all.debug.yml +++ /dev/null @@ -1,138 +0,0 @@ -# This compose file is useful for testing https ---- -version: "3" -services: - redis: - image: redis:4.0 - platform: "linux/amd64" - volumes: - - redis_data:/data - - ../redis.conf:/usr/local/etc/redis/redis.conf - ports: - - 127.0.0.1:6379:6379 - command: redis-server /usr/local/etc/redis/redis.conf --appendonly yes - container_name: des_redis - hostname: des_redis - - rabbitmq: - image: arm64v8/rabbitmq:3.6.14-management - volumes: - - rabbitmq_data:/var/lib/rabbitmq/mnesia/rabbit@des_rabbitmq - - ../rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf - env_file: ../env_files/rabbitmq.env - ports: - - 127.0.0.1:5672:5672 - - 127.0.0.1:5673:5673 - - 127.0.0.1:15673:15673 - - 127.0.0.1:15672:15672 - container_name: des_rabbitmq - hostname: des_rabbitmq - - memcached: - image: memcached:latest - platform: "linux/amd64" - container_name: des_memcached - hostname: des_memcached - - elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.4.0 - platform: "linux/amd64" - ulimits: - memlock: -1 - environment: - - ES_HEAP_SIZE:2g - volumes: - - ../elasticsearch/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml - - ../elasticsearch/log4j2.properties:/usr/share/elasticsearch/config/log4j2.properties - - es_data:/usr/share/elasticsearch/data - ports: - - 127.0.0.1:9200:9200 - container_name: des_elasticsearch - hostname: des_elasticsearch - - mysql: - image: mysql:5.6 - platform: "linux/amd64" - volumes: - - mysql_data:/var/lib/mysql - - ../mysql.cnf:/etc/mysql/conf.d/mysql.cnf - env_file: ../env_files/mysql.env - ports: - - 127.0.0.1:3306:3306 - container_name: des_mysql - hostname: des_mysql - - nginx: - image: nginx - platform: "linux/amd64" - volumes: - - ../nginx/nginx.debug.conf:/etc/nginx/nginx.conf - - ../nginx/gzip.conf:/etc/nginx/gzip.conf - - ../nginx/certificates/designsafe.dev.crt:/etc/ssl/designsafe.dev.crt - - ../nginx/certificates/designsafe.dev.key:/etc/ssl/designsafe.dev.key - - ../nginx/dhparam.pem:/etc/ssl/dhparam.pem - - ../../.:/srv/www/designsafe - - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI - - ../../data/static:/var/www/designsafe-ci.org/static - - ../../data/media:/var/www/designsafe-ci.org/media - links: - - django:django - ports: - - 127.0.0.1:80:80 - - 127.0.0.1:443:443 - container_name: des_nginx - hostname: des_nginx - - django: - image: designsafeci/portal:local - env_file: ../env_files/designsafe.env - links: - - memcached:memcached - - mysql:mysql - - rabbitmq:rabbitmq - - redis:redis - - elasticsearch:elasticsearch - volumes: - - ../../.:/srv/www/designsafe - - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI - - ../../data/static:/var/www/designsafe-ci.org/static - - ../../data/media:/var/www/designsafe-ci.org/media - ports: - - 127.0.0.1:8000:8000 - - 127.0.0.1:5555:5555 - - 127.0.0.1:9000:9000 - dns: - - 8.8.8.8 - - 8.8.4.4 - command: /srv/www/designsafe/bin/run-django.sh - container_name: des_django - hostname: des_django - - workers: - image: designsafeci/portal:local - env_file: ../env_files/designsafe.env - links: - - memcached:memcached - - mysql:mysql - - rabbitmq:rabbitmq - - redis:redis - - elasticsearch:elasticsearch - volumes: - - ../../.:/srv/www/designsafe - - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI - - ../../data/static:/var/www/designsafe-ci.org/static - - ../../data/media:/var/www/designsafe-ci.org/media - dns: - - 8.8.8.8 - - 8.8.4.4 - command: /srv/www/designsafe/bin/run-celery-debug.sh - container_name: des_workers - hostname: des_workers - -volumes: - redis_data: - mysql_data: - es_data: - rabbitmq_data: - sockets: - From ab557d56d655c7db26a283fb1b347d0d0d9b6dcb Mon Sep 17 00:00:00 2001 From: Van Go <35277477+van-go@users.noreply.github.com> Date: Fri, 14 Jul 2023 16:31:03 -0500 Subject: [PATCH 4/4] Create docker-compose-dev.all.debug.yml --- conf/docker/docker-compose-dev.all.debug.yml | 132 +++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 conf/docker/docker-compose-dev.all.debug.yml diff --git a/conf/docker/docker-compose-dev.all.debug.yml b/conf/docker/docker-compose-dev.all.debug.yml new file mode 100644 index 000000000..9a3b98d85 --- /dev/null +++ b/conf/docker/docker-compose-dev.all.debug.yml @@ -0,0 +1,132 @@ +# This compose file is useful for testing https +--- +version: "3" +services: + redis: + image: redis:4.0 + volumes: + - redis_data:/data + - ../redis.conf:/usr/local/etc/redis/redis.conf + ports: + - 127.0.0.1:6379:6379 + command: redis-server /usr/local/etc/redis/redis.conf --appendonly yes + container_name: des_redis + hostname: des_redis + + rabbitmq: + image: rabbitmq:3.6.10-management + volumes: + - rabbitmq_data:/var/lib/rabbitmq/mnesia/rabbit@des_rabbitmq + - ../rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf + env_file: ../env_files/rabbitmq.env + ports: + - 127.0.0.1:5672:5672 + - 127.0.0.1:5673:5673 + - 127.0.0.1:15673:15673 + - 127.0.0.1:15672:15672 + container_name: des_rabbitmq + hostname: des_rabbitmq + + memcached: + image: memcached:latest + container_name: des_memcached + hostname: des_memcached + + elasticsearch: + image: docker.elastic.co/elasticsearch/elasticsearch:7.4.0 + ulimits: + memlock: -1 + environment: + - ES_HEAP_SIZE:2g + volumes: + - ../elasticsearch/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml + - ../elasticsearch/log4j2.properties:/usr/share/elasticsearch/config/log4j2.properties + - es_data:/usr/share/elasticsearch/data + ports: + - 127.0.0.1:9200:9200 + container_name: des_elasticsearch + hostname: des_elasticsearch + + mysql: + image: mysql:5.6 + volumes: + - mysql_data:/var/lib/mysql + - ../mysql.cnf:/etc/mysql/conf.d/mysql.cnf + env_file: ../env_files/mysql.env + ports: + - 127.0.0.1:3306:3306 + container_name: des_mysql + hostname: des_mysql + + nginx: + image: nginx + volumes: + - ../nginx/nginx.debug.conf:/etc/nginx/nginx.conf + - ../nginx/gzip.conf:/etc/nginx/gzip.conf + - ../nginx/certificates/designsafe.dev.crt:/etc/ssl/designsafe.dev.crt + - ../nginx/certificates/designsafe.dev.key:/etc/ssl/designsafe.dev.key + - ../nginx/dhparam.pem:/etc/ssl/dhparam.pem + - ../../.:/srv/www/designsafe + - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI + - ../../data/static:/var/www/designsafe-ci.org/static + - ../../data/media:/var/www/designsafe-ci.org/media + links: + - django:django + ports: + - 127.0.0.1:80:80 + - 127.0.0.1:443:443 + container_name: des_nginx + hostname: des_nginx + + django: + image: designsafeci/portal:local + env_file: ../env_files/designsafe.env + links: + - memcached:memcached + - mysql:mysql + - rabbitmq:rabbitmq + - redis:redis + - elasticsearch:elasticsearch + volumes: + - ../../.:/srv/www/designsafe + - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI + - ../../data/static:/var/www/designsafe-ci.org/static + - ../../data/media:/var/www/designsafe-ci.org/media + ports: + - 127.0.0.1:8000:8000 + - 127.0.0.1:5555:5555 + - 127.0.0.1:9000:9000 + dns: + - 8.8.8.8 + - 8.8.4.4 + command: /srv/www/designsafe/bin/run-django.sh + container_name: des_django + hostname: des_django + + workers: + image: designsafeci/portal:local + env_file: ../env_files/designsafe.env + links: + - memcached:memcached + - mysql:mysql + - rabbitmq:rabbitmq + - redis:redis + - elasticsearch:elasticsearch + volumes: + - ../../.:/srv/www/designsafe + - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI + - ../../data/static:/var/www/designsafe-ci.org/static + - ../../data/media:/var/www/designsafe-ci.org/media + dns: + - 8.8.8.8 + - 8.8.4.4 + command: /srv/www/designsafe/bin/run-celery-debug.sh + container_name: des_workers + hostname: des_workers + +volumes: + redis_data: + mysql_data: + es_data: + rabbitmq_data: + sockets: