From 4c2daad7943bd0cab5ef26348e808dcf41a70327 Mon Sep 17 00:00:00 2001 From: Andy Flint Date: Wed, 22 Feb 2023 16:11:48 +0000 Subject: [PATCH] Replaced github references to 'answerconsulting' with 'answerdigital' --- .github/workflows/build_docker_package.yml | 4 ++-- .github/workflows/deploy-app-ec2.yml | 2 +- terraform/main.tf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_docker_package.yml b/.github/workflows/build_docker_package.yml index 1a77b686..e46bc128 100644 --- a/.github/workflows/build_docker_package.yml +++ b/.github/workflows/build_docker_package.yml @@ -11,7 +11,7 @@ on: types: [opened, synchronize, reopened, completed] env: - REGISTRY: ghcr.io/answerconsulting/answerking-java + REGISTRY: ghcr.io/answerdigital/answerking-java IMAGE_NAME: answer-king-rest-api_app #${{ github.repository }} MYSQLDB_ROOT_PASSWORD: ${{ secrets.MYSQLDB_ROOT_PASSWORD }} MYSQLDB_PASSWORD: ${{ secrets.MYSQLDB_PASSWORD }} @@ -69,7 +69,7 @@ jobs: # run: docker-compose push #--ignore-push-failures - name: Tag docker image - run: docker tag answer-king-rest-api_app ghcr.io/answerconsulting/answerking-java/answer-king-rest-api_app:latest + run: docker tag answer-king-rest-api_app ghcr.io/answerdigital/answerking-java/answer-king-rest-api_app:latest - name: Push images run: docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest diff --git a/.github/workflows/deploy-app-ec2.yml b/.github/workflows/deploy-app-ec2.yml index 54220dab..35a529e8 100644 --- a/.github/workflows/deploy-app-ec2.yml +++ b/.github/workflows/deploy-app-ec2.yml @@ -11,7 +11,7 @@ on: types: [opened, synchronize, reopened, completed] env: - REGISTRY: ghcr.io/answerconsulting/answerking-java + REGISTRY: ghcr.io/answerdigital/answerking-java IMAGE_NAME: answer-king-rest-api_app jobs: diff --git a/terraform/main.tf b/terraform/main.tf index f0930841..e6312d27 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -104,7 +104,7 @@ resource "aws_instance" "answer_king_java" { # Allow the ec2-user to run docker commands without sudo usermod -a -G docker ec2-user # Run application at start - docker container run --name answer-king-rest-api-container --restart=always --name answer-king-rest-api-container -e "RDS_USERNAME=${var.db_username}" -e "RDS_PASSWORD=${var.db_password}" -e "RDS_HOSTNAME=${aws_db_instance.answer_king_database.address}" -e "RDS_PORT=${var.db_port}" -e "RDS_DB_NAME=${var.db_name}" -e "SPRING_PROFILES_ACTIVE=${var.spring_profile}" -e "MYSQLDB_PASSWORD=${var.db_password}" -e "MYSQLDB_USER=${var.db_username}" -e "MYSQL_URL=jdbc:mysql://${aws_db_instance.answer_king_database.address}:${var.db_port}/${var.db_name}" -p ${var.http_server_port}:${var.http_server_port} -d ghcr.io/answerconsulting/answerking-java/answer-king-rest-api_app:latest + docker container run --name answer-king-rest-api-container --restart=always --name answer-king-rest-api-container -e "RDS_USERNAME=${var.db_username}" -e "RDS_PASSWORD=${var.db_password}" -e "RDS_HOSTNAME=${aws_db_instance.answer_king_database.address}" -e "RDS_PORT=${var.db_port}" -e "RDS_DB_NAME=${var.db_name}" -e "SPRING_PROFILES_ACTIVE=${var.spring_profile}" -e "MYSQLDB_PASSWORD=${var.db_password}" -e "MYSQLDB_USER=${var.db_username}" -e "MYSQL_URL=jdbc:mysql://${aws_db_instance.answer_king_database.address}:${var.db_port}/${var.db_name}" -p ${var.http_server_port}:${var.http_server_port} -d ghcr.io/answerdigital/answerking-java/answer-king-rest-api_app:latest EOF user_data_replace_on_change = true