diff --git a/Makefile b/Makefile index d54f5e1e9..f0817c307 100755 --- a/Makefile +++ b/Makefile @@ -1,8 +1,7 @@ veekun_pokedex_repository = ../pokedex local_config = --settings=config.local docker_config = --settings=config.docker-compose -gql_compose_config = -f docker-compose.yml -f Resources/compose/docker-compose-prod-graphql.yml -gqlv1beta_compose_config = -f docker-compose.yml -f Resources/compose/docker-compose-prod-graphql.yml -f Resources/compose/docker-compose-prod-graphql-v1beta.yml +gql_compose_config = -f docker-compose.yml -f docker-compose-dev.yml -f Resources/compose/docker-compose-prod-graphql.yml .PHONY: help .SILENT: @@ -112,12 +111,6 @@ sync-to-veekun: pull pull-veekun # Copy data from this repository to ../pokedex # read-env-file: # Exports ./.env into shell environment variables # export `egrep -v '^#' .env | xargs` -hasura-export-v1beta: - hasura md export --project graphql/v1beta - -hasura-apply-v1beta: - hasura md apply --project graphql/v1beta - hasura-export: # Export Hasura configuration, be sure to have set HASURA_GRAPHQL_ADMIN_SECRET hasura md export --project graphql/v1beta2 @@ -160,23 +153,6 @@ down-graphql-prod: docker volume prune --all --force sync; echo 3 > /proc/sys/vm/drop_caches -update-graphql-v1beta-data-prod: - docker compose ${gqlv1beta_compose_config} stop - git pull origin master - git submodule update --remote --merge - docker compose ${gqlv1beta_compose_config} up --pull always -d app cache db - sync; echo 3 > /proc/sys/vm/drop_caches - make docker-migrate - make docker-build-db - docker compose ${gqlv1beta_compose_config} stop app cache - docker compose ${gqlv1beta_compose_config} up --pull always -d graphql-engine graphiql - sleep 120 - make hasura-apply-v1beta - docker compose ${gqlv1beta_compose_config} up --pull always -d web - docker compose exec -T web sh -c 'rm -rf /tmp/cache/*' - docker image prune -af - sync; echo 3 > /proc/sys/vm/drop_caches - # Nginx doesn't start if upstream graphql-engine is down update-graphql-data-prod: docker compose ${gql_compose_config} stop diff --git a/Resources/compose/docker-compose-prod-graphql-v1beta.yml b/Resources/compose/docker-compose-prod-graphql-v1beta.yml deleted file mode 100644 index 8748fe99d..000000000 --- a/Resources/compose/docker-compose-prod-graphql-v1beta.yml +++ /dev/null @@ -1,10 +0,0 @@ -# TODO: when removing v1beta, delete the file -version: '2.4' -services: - graphiql: - image: pokeapi/graphiql:v1beta-2.1.0 - web: - volumes: - - ./Resources/nginx/nginx-gql-v1beta.conf:/etc/nginx/nginx.conf:ro - - ./Resources/nginx/ssl:/ssl:ro - - graphql_cache:/tmp/cache \ No newline at end of file