diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml new file mode 100644 index 0000000..49cd93b --- /dev/null +++ b/.github/workflows/aws.yml @@ -0,0 +1,83 @@ +name: Deploy to AWS ECS + +on: + push: + branches: ['Abel/Deploy'] # Update to push to 'main' when complete + +concurrency: + group: deploy-${{ github.ref }} + cancel-in-progress: true + +env: + ECR_REPOSITORY: app # Set this to your Amazon ECR repository name + ECS_SERVICE: SkyDevOps # Set this to your Amazon ECS service name + ECS_CLUSTER: Sky # Set this to your Amazon ECS cluster name + +permissions: + contents: read + +jobs: + deploy: + name: Deploy to AWS ECS + runs-on: ubuntu-latest + environment: production + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v4 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ${{ secrets.AWS_REGION }} + + - name: Login to AWS ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v2 + + - name: Build and push new Docker image to AWS ECR + id: build-image + env: + ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} + IMAGE_TAG: latest + run: | + # Use Docker Buildx to build the image for x86_64 + docker buildx build --platform linux/amd64 --push -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . + + echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT + echo "Docker image $ECR_REPOSITORY:$IMAGE_TAG has been built and pushed to $ECR_REGISTRY" + + - name: Deploy to AWS ECS + run: | + # Update the ECS service + aws ecs update-service --cluster ${{ env.ECS_CLUSTER }} --service ${{ env.ECS_SERVICE }} --force-new-deployment + + # Define the website URL and the desired status code + WEBSITE_URL="https://skyscraper-api.com" + EXPECTED_STATUS_CODE=200 + + # Loop until the website returns the expected status code + # Wait 30 seconds before sending request + sleep 30 + while true; do + # Send a HEAD request to the website and capture the HTTP status code + HTTP_STATUS=$(curl -s -o /dev/null -w "%{http_code}" $WEBSITE_URL) + + # Check if the status code matches the expected status code + if [ "$HTTP_STATUS" -eq "$EXPECTED_STATUS_CODE" ]; then + echo "Website is back up with status code $HTTP_STATUS" + break + else + echo "Website down. Current status code: $HTTP_STATUS" + fi + + # Wait 20 seconds before the next check + sleep 20 + done + echo "Website online" + echo "Deployment successful" diff --git a/Dockerfile b/Dockerfile index cfd8983..9b38891 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20 +FROM public.ecr.aws/docker/library/node:20-alpine # Set the working directory WORKDIR /usr/src/app @@ -7,13 +7,14 @@ WORKDIR /usr/src/app COPY package*.json ./ # Install dependencies +RUN npm install -g npm@latest RUN npm install # Copy the rest of the application code COPY ./client ./client COPY ./server ./server -# Build the client and server +# Build the server and client RUN npm run build:server RUN npm run build:prd diff --git a/README.md b/README.md index c10cc44..4d479ad 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@
- +
SkyScraper is an innovative visualizer dashboard that transforms the way developers interact with AWS performance data, starting with EC2. By offering a streamlined, intuitive interface, SkyScraper optimizes the retrieval, organization, and visualization of performance metrics, enabling users to manage their AWS environments effectively. @@ -67,17 +67,17 @@ Designed with a focus on clarity and aesthetics, SkyScraper features custom them ### Built With -- [](https://www.typescriptlang.org/) [TypeScript](https://www.typescriptlang.org/) -- [](https://reactjs.org/) [React](https://reactjs.org/) -- [](https://redux-toolkit.js.org/) [Redux](https://redux-toolkit.js.org/) -- [](https://nodejs.org/en) [Node.js](https://nodejs.org/en) -- [](https://expressjs.com/) [Express](https://expressjs.com/) -- [](https://www.chartjs.org/) [Chart.js](https://www.chartjs.org/) -- [](https://webpack.js.org/) [Webpack](https://webpack.js.org/) -- [](https://auth0.com/) [Auth0](https://auth0.com/) -- [](https://docs.aws.amazon.com/cognitoidentity/latest/APIReference/Welcome.html) [AWS Cognito API](https://docs.aws.amazon.com/cognitoidentity/latest/APIReference/Welcome.html) -- [](https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/Welcome.html) [AWS CloudWatch API](https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/Welcome.html) -- [](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Welcome.html) [AWS EC2 API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Welcome.html) +- [](https://www.typescriptlang.org/) [TypeScript](https://www.typescriptlang.org/) +- [](https://reactjs.org/) [React](https://reactjs.org/) +- [](https://redux-toolkit.js.org/) [Redux](https://redux-toolkit.js.org/) +- [](https://nodejs.org/en) [Node.js](https://nodejs.org/en) +- [](https://expressjs.com/) [Express](https://expressjs.com/) +- [](https://www.chartjs.org/) [Chart.js](https://www.chartjs.org/) +- [](https://webpack.js.org/) [Webpack](https://webpack.js.org/) +- [](https://auth0.com/) [Auth0](https://auth0.com/) +- [](https://docs.aws.amazon.com/cognitoidentity/latest/APIReference/Welcome.html) [AWS Cognito API](https://docs.aws.amazon.com/cognitoidentity/latest/APIReference/Welcome.html) +- [](https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/Welcome.html) [AWS CloudWatch API](https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/Welcome.html) +- [](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Welcome.html) [AWS EC2 API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Welcome.html) @@ -150,25 +150,25 @@ Distributed under the MIT License. See [`LICENSE`](https://github.com/oslabs-bet ## Creators -[](https://github.com/abelr20) [](https://www.linkedin.com/in/abel-ratanaphan/) Abel Ratanaphan +[](https://github.com/abelr20) [](https://www.linkedin.com/in/abel-ratanaphan/) Abel Ratanaphan -[](https://github.com/b-the-coder) [](https://www.linkedin.com/in/bin-emma-he/) Bin He +[](https://github.com/b-the-coder) [](https://www.linkedin.com/in/bin-emma-he/) Bin He -[](https://github.com/ChristieLaf) [](https://www.linkedin.com/in/christie-laferriere/) Christie Laferriere +[](https://github.com/ChristieLaf) [](https://www.linkedin.com/in/christie-laferriere/) Christie Laferriere -[](https://github.com/TrippMurphy) [](https://www.linkedin.com/in/trippmurphy/) Tripp Murphy +[](https://github.com/TrippMurphy) [](https://www.linkedin.com/in/trippmurphy/) Tripp Murphy -[](https://github.com/Nikolaa92) [](https://www.linkedin.com/in/nikola-andelkovic/) Nikola Andelkovic +[](https://github.com/Nikolaa92) [](https://www.linkedin.com/in/nikola-andelkovic/) Nikola Andelkovic ## Contact Us - AppSkyScraper@gmail.com + AppSkyScraper@gmail.com -[]() [@SkyScraperApp](https://x.com/SkyScraperApp) +[]() [@SkyScraperApp](https://x.com/SkyScraperApp) -[]() [github.com/oslabs-beta/SkyScraper](https://github.com/oslabs-beta/SkyScraper/) +[]() [github.com/oslabs-beta/SkyScraper](https://github.com/oslabs-beta/SkyScraper/) diff --git a/client/public/favicon.ico b/client/public/favicon.ico new file mode 100644 index 0000000..d0a1d4b Binary files /dev/null and b/client/public/favicon.ico differ diff --git a/client/public/index.html b/client/public/index.html index f8c61f0..dd45262 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -1,4 +1,3 @@ -