Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
env:
AWS_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
ECR_REPOSITORY: 571094861812.dkr.ecr.us-east-1.amazonaws.com/name-generator
PROD_IMAGE_TAG: prod-name-generator
CLUSTER_NAME: prod-name-generator
SERVICE_NAME: prod-name-generator-server
ECR_REPOSITORY: 571094861812.dkr.ecr.us-east-1.amazonaws.com/namegraph
PROD_IMAGE_TAG: prod-namegraph
CLUSTER_NAME: prod-namegraph
SERVICE_NAME: prod-namegraph-server

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion authorize-ecr.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 571094861812.dkr.ecr.us-east-1.amazonaws.com/name-generator
aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 571094861812.dkr.ecr.us-east-1.amazonaws.com/namegraph
2 changes: 1 addition & 1 deletion docker-compose.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ services:
build:
context: .
dockerfile: Dockerfile
image: 571094861812.dkr.ecr.us-east-1.amazonaws.com/name-generator:${TAG}
image: 571094861812.dkr.ecr.us-east-1.amazonaws.com/namegraph:${TAG}
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ services:
- ES_USERNAME=${ES_USERNAME}
- ES_PASSWORD=${ES_PASSWORD}
- ES_INDEX=${ES_INDEX}
image: 571094861812.dkr.ecr.us-east-1.amazonaws.com/name-generator:${TAG}
image: 571094861812.dkr.ecr.us-east-1.amazonaws.com/namegraph:${TAG}
ports:
- 80:8000
4 changes: 2 additions & 2 deletions docs/old_readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Authorize to ECR:

Push image to ECR:

`docker push 571094861812.dkr.ecr.us-east-1.amazonaws.com/name-generator:${TAG}
`docker push 571094861812.dkr.ecr.us-east-1.amazonaws.com/namegraph:${TAG}

## Deploy image on remote instance

Expand All @@ -107,7 +107,7 @@ Set image TAG:

Authorize EC2 instance in ECR:

`aws ecr get-login-password | docker login --username AWS --password-stdin 571094861812.dkr.ecr.us-east-1.amazonaws.com/name-generator`
`aws ecr get-login-password | docker login --username AWS --password-stdin 571094861812.dkr.ecr.us-east-1.amazonaws.com/namegraph`

(Re-Deploy) image:

Expand Down
2 changes: 1 addition & 1 deletion namegraph/download_from_s3.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class S3Downloader:
def __init__(self):
self.s3_client = None
self.region_name = 'us-east-1'
self.bucket = 'prod-name-generator-namegeneratori-inputss3bucket-c26jqo3twfxy'
self.bucket = 'prod-namegraph-namegeneratori-inputss3bucket-c26jqo3twfxy'

def get_client(self):
if self.s3_client is None:
Expand Down
1 change: 0 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

<!-- VERTICAL WHITESPACE -->

<br>
Expand Down
2 changes: 1 addition & 1 deletion research/other-collections/map-ids.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def collect_elastic_ids_for_wikidata_ids(es: Elasticsearch, index: str, wikidata
with open(args.output, 'w', encoding='utf-8') as f:
json.dump(mapped_other_collections_records, f, indent=2, ensure_ascii=False)

# name-generator/data/collections_data/other_collections.json
# namegraph/data/collections_data/other_collections.json

# No elastic ID for Q1322417 - Wealthiest historical figures
# No elastic ID for Q1547772 - Stars for navigation
Expand Down