Skip to content

Commit

Permalink
Merge pull request #40 from IntersectMBO/remove-concept
Browse files Browse the repository at this point in the history
remove concept app environment
  • Loading branch information
Ryun1 authored Dec 19, 2023
2 parents b631c5c + f7a58ca commit 5d3e614
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 258 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
blank_issues_enabled: true
contact_links:
- name: Contributing guidelines
url: https://github.com/input-output-hk/voltaire-era/blob/master/CONTRIBUTING.md
url: https://github.com/IntersectMBO/govtool/blob/master/CONTRIBUTING.md
about: Some rules & processes we honor.

- name: Feature ideas
url: https://github.com/input-output-hk/voltaire-era/discussions/categories/ideas
url: https://github.com/IntersectMBO/govtool/discussions/categories/ideas
about: Maybe someone else had the same or a similar idea already?

- name: All issues
url: https://github.com/input-output-hk/voltaire-era/issues
url: https://github.com/IntersectMBO/govtool/issues
about: Check whether your issue is not already covered here.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_idea.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ body:
value: |
**Thank you for contributing to our project!** :green_heart:
Instead of opening this issue, consider [starting a new idea discussion](https://github.com/input-output-hk/voltaire-era/discussions/new?category=ideas).
Instead of opening this issue, consider [starting a new idea discussion](https://github.com/IntersectMBO/govtool/discussions/new?category=ideas).
That way, we can discuss & refine your idea together, before we adopt it as a feature into the roadmap.
- type: textarea
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ on:
cardano_network:
required: true
type: choice
default: "preprod"
default: "sanchonet"
options:
- "preprod"
- "sanchonet"
environment:
required: true
Expand All @@ -27,7 +26,7 @@ on:

env:
ENVIRONMENT: ${{ inputs.environment || 'dev' }}
CARDANO_NETWORK: ${{ inputs.cardano_network || 'preprod' }}
CARDANO_NETWORK: ${{ inputs.cardano_network || 'sanchonet' }}

jobs:
check_environment_exists:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test_integration_cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ on:
type: choice
default: "sanchonet"
options:
- "preprod"
- "sanchonet"
deployment:
required: true
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/toggle-maintenance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ on:
cardano_network:
required: true
type: choice
default: "preprod"
default: "sanchonet"
options:
- "preprod"
- "sanchonet"
environment:
required: true
Expand All @@ -30,7 +29,7 @@ on:

env:
ENVIRONMENT: ${{ inputs.environment || 'dev' }}
CARDANO_NETWORK: ${{ inputs.cardano_network || 'preprod' }}
CARDANO_NETWORK: ${{ inputs.cardano_network || 'sanchonet' }}

jobs:
check_environment_exists:
Expand Down
3 changes: 1 addition & 2 deletions src/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ use nix shell.nix
export AWS_PROFILE=vva

export ENVIRONMENT="dev"
export INSTANCE="preprod"
export CARDANO_NETWORK="preprod"
export CARDANO_NETWORK="sanchonet"
export SLACK_WEBHOOK_URL=<slack webhook url>

export DBSYNC_POSTGRES_USER="postgres"
Expand Down
230 changes: 0 additions & 230 deletions src/docker-compose.preprod.yml

This file was deleted.

8 changes: 4 additions & 4 deletions src/docker-compose.sanchonet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ services:
- "--disable-delayed-os-memory-return"
- "-RTS"
environment:
- NETWORK=${CARDANO_NETWORK:-preprod}
- NETWORK=${CARDANO_NETWORK:-sanchonet}
volumes:
- node-db:/data/db
- node-ipc:/ipc
Expand All @@ -145,7 +145,7 @@ services:
cardano-db-sync:
image: ghcr.io/input-output-hk/cardano-db-sync:sancho-2-3-0-docker
environment:
- NETWORK=${CARDANO_NETWORK:-preprod}
- NETWORK=${CARDANO_NETWORK:-sanchonet}
- POSTGRES_HOST=postgres
- POSTGRES_PORT=5432
- RESTORE_SNAPSHOT=${RESTORE_SNAPSHOT:-}
Expand All @@ -167,7 +167,7 @@ services:
logging: *logging

vva-be:
image: ${VVA_BE_REPO:-733019650473.dkr.ecr.eu-west-1.amazonaws.com/backend}:${TAG:-main-dev-preprod}
image: ${VVA_BE_REPO:-733019650473.dkr.ecr.eu-west-1.amazonaws.com/backend}:${TAG:-main-dev-sanchonet}
command: /usr/local/bin/vva-be -c /run/secrets/vva-be-config.json start-app
depends_on:
cardano-node:
Expand All @@ -191,7 +191,7 @@ services:
- "traefik.http.services.vva-be.loadbalancer.server.port=9876"

vva-fe:
image: ${VVA_FE_REPO:-733019650473.dkr.ecr.eu-west-1.amazonaws.com/frontend}:${TAG:-main-dev-preprod}
image: ${VVA_FE_REPO:-733019650473.dkr.ecr.eu-west-1.amazonaws.com/frontend}:${TAG:-main-dev-sanchonet}
depends_on:
cardano-node:
condition: service_healthy
Expand Down
11 changes: 0 additions & 11 deletions src/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,6 @@ resource "aws_iam_group_policy_attachment" "cicd" {

# duplicate the following block in order to prepare a new environment
# make sure that app_env/cardano_network variable pair is unique
module "vva-dev-preprod" {
source = "./modules/vva-ec2"
app_env = "dev"
cardano_network = "preprod"
instance_type = "t3.large"
dns_zone_id = aws_route53_zone.govtool.id
}

module "vva-dev-sanchonet" {
source = "./modules/vva-ec2"
Expand Down Expand Up @@ -102,10 +95,6 @@ output "vva-ecr-fe-url" {
value = module.vva-ecr-fe.repo_url
}

output "vva-dev-preprod-frontend-domain" {
value = module.vva-dev-preprod.frontend_domain
}

output "vva-dev-sanchonet-frontend-domain" {
value = module.vva-dev-sanchonet.frontend_domain
}
Expand Down

0 comments on commit 5d3e614

Please sign in to comment.