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
4 changes: 2 additions & 2 deletions .github/workflows/build_docker_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/deploy-app-ec2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down