diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml deleted file mode 100644 index 68c97b3..0000000 --- a/.github/workflows/deploy.yaml +++ /dev/null @@ -1,53 +0,0 @@ -# name: Deploy to ec2 -# on: -# push: -# branches: -# - main - -# jobs: -# Deployment: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v4 -# name: checkout repo - -# - uses: burnett01/rsync-deployments@7.0.1 -# name: deploy -# with: -# switches: -avzr --delete -# remote_host: ${{ secrets.EC2_HOST }} -# remote_user: ec2-user -# remote_key: ${{ secrets.EC2_KEY }} -# remote_path: /myapp -# - uses: JimCronqvist/action-ssh@master -# name: Execute ssh -# with: -# hosts: ${{ secrets.HOST_USERNAME }}@${{ secrets.EC2_HOST }} -# privatekey: ${{ secrets.EC2_KEY }} -# command: | -# sudo apt install docker-compose-plugin -y -# docker pull stefnie/api-image:latest -# docker pull stefnie/uri-image:latest -# docker-compose -f compose.yaml up -d - - - - - - - - - - - - - -# # port: 22 -# # script : | -# # sudo su -# # sudo apt update -y -# # sudo apt install docker.io -y -# # sudo apt install docker-compose-plugin -y -# # docker pull stefnie/api-image:latest -# # docker pull stefnie/uri-image:latest -# # docker-compose -f compose.yaml up -d \ No newline at end of file diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index d4571a7..f725586 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -1,29 +1,53 @@ -# name: Lint test -# on: -# push: -# branches: -# - main -# # pull_request: -# # branches: -# # - main - - -# jobs: -# lint-test: -# runs-on: ubuntu-latest -# strategy: -# matrix: -# python-version: ["3.8", "3.9", "3.10", "3.12"] -# steps: -# - uses: actions/checkout@v4 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v3 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Install dependencies -# run: | -# python -m pip install --upgrade pip -# pip install pylint -# - name: Analysing the code with pylint -# run: | -# pylint $(git ls-files '*.py') +name: Deploy to ec2 +on: +push: + branches: + - main + +jobs: + Deployment: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + name: checkout repo + + - uses: burnett01/rsync-deployments@7.0.1 + name: deploy + with: + switches: -avzr --delete + remote_host: ${{ secrets.EC2_HOST }} + remote_user: ec2-user + remote_key: ${{ secrets.EC2_KEY }} + remote_path: /myapp + - uses: JimCronqvist/action-ssh@master + name: Execute ssh + with: + hosts: ${{ secrets.HOST_USERNAME }}@${{ secrets.EC2_HOST }} + privatekey: ${{ secrets.EC2_KEY }} + command: | + sudo apt install docker-compose-plugin -y + docker pull stefnie/api-image:latest + docker pull stefnie/uri-image:latest + docker-compose -f compose.yaml up -d + + + + + + + + + + + + + + # port: 22 + # script : | + # sudo su + # sudo apt update -y + # sudo apt install docker.io -y + # sudo apt install docker-compose-plugin -y + # docker pull stefnie/api-image:latest + # docker pull stefnie/uri-image:latest + # docker-compose -f compose.yaml up -d \ No newline at end of file diff --git a/infrastructure/main.tf b/infrastructure/main.tf index 6955e08..6ceac99 100644 --- a/infrastructure/main.tf +++ b/infrastructure/main.tf @@ -51,6 +51,14 @@ resource "aws_security_group" "instance" { cidr_blocks = ["0.0.0.0/0"] } + ingress { + from_port = 8080 + to_port = 8080 + protocol = "tcp" + cidr_blocks = ["0.0.0.0/0"] + } + + egress { from_port = 0 to_port = 0