Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
weiwang0305 committed Apr 17, 2024
1 parent a741eef commit b2ab035
Show file tree
Hide file tree
Showing 3 changed files with 197 additions and 45 deletions.
104 changes: 86 additions & 18 deletions .github/workflows/docker-server.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,96 @@
name: ci
# This workflow will build and push a new container image to Amazon ECR,
# and then will deploy a new task definition to Amazon ECS, when there is a push to the "master" branch.
#
# To use this workflow, you will need to complete the following set-up steps:
#
# 1. Create an ECR repository to store your images.
# For example: `aws ecr create-repository --repository-name my-ecr-repo --region us-east-2`.
# Replace the value of the `ECR_REPOSITORY` environment variable in the workflow below with your repository's name.
# Replace the value of the `AWS_REGION` environment variable in the workflow below with your repository's region.
#
# 2. Create an ECS task definition, an ECS cluster, and an ECS service.
# For example, follow the Getting Started guide on the ECS console:
# https://us-east-2.console.aws.amazon.com/ecs/home?region=us-east-2#/firstRun
# Replace the value of the `ECS_SERVICE` environment variable in the workflow below with the name you set for the Amazon ECS service.
# Replace the value of the `ECS_CLUSTER` environment variable in the workflow below with the name you set for the cluster.
#
# 3. Store your ECS task definition as a JSON file in your repository.
# The format should follow the output of `aws ecs register-task-definition --generate-cli-skeleton`.
# Replace the value of the `ECS_TASK_DEFINITION` environment variable in the workflow below with the path to the JSON file.
# Replace the value of the `CONTAINER_NAME` environment variable in the workflow below with the name of the container
# in the `containerDefinitions` section of the task definition.
#
# 4. Store an IAM user access key in GitHub Actions secrets named `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`.
# See the documentation for each action used below for the recommended IAM policies for this IAM user,
# and best practices on handling the access key credentials.

name: Deploy to Amazon ECS

on:
push:
branches:
- 'dev'
branches: ['dev']

env:
AWS_REGION: us-east-2 # set this to your preferred AWS region, e.g. us-west-1
ECR_REPOSITORY: currentc # set this to your Amazon ECR repository name
ECS_SERVICE: currentC-server-deploy # set this to your Amazon ECS service name
ECS_CLUSTER: currentC # set this to your Amazon ECS cluster name
ECS_TASK_DEFINITION:
.github/workflows/task-definition-server.json # set this to the path to your Amazon ECS task definition
# file, e.g. .aws/task-definition.json
CONTAINER_NAME:
currentC-server # set this to the name of the container in the
# containerDefinitions section of your task definition

permissions:
contents: read

jobs:
docker:
deploy:
name: Deploy
runs-on: ubuntu-latest
environment: production

steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to Docker Hub
uses: docker/login-action@v3
uses: actions/checkout@v3

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push server
uses: docker/build-push-action@v5
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1

- name: Build, tag, and push image to Amazon ECR
id: build-image
env:
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
IMAGE_TAG: ${{ github.sha }}
run: |
# Build a docker container and
# push it to ECR so that it can
# be deployed to ECS.
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG ./server
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
- name: Fill in the new image ID in the Amazon ECS task definition
id: task-def
uses: aws-actions/amazon-ecs-render-task-definition@v1
with:
task-definition: ${{ env.ECS_TASK_DEFINITION }}
container-name: ${{ env.CONTAINER_NAME }}
image: ${{ steps.build-image.outputs.image }}

- name: Deploy Amazon ECS task definition
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
with:
context: ./server
push: true
tags: weiwang35/alerty:server-latest
task-definition: ${{ steps.task-def.outputs.task-definition }}
service: ${{ env.ECS_SERVICE }}
cluster: ${{ env.ECS_CLUSTER }}
wait-for-service-stability: true
80 changes: 80 additions & 0 deletions .github/workflows/task-definition-server.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"taskDefinitionArn": "arn:aws:ecs:us-east-2:525357733102:task-definition/currentC-server:8",
"containerDefinitions": [
{
"name": "currentC-server",
"image": "525357733102.dkr.ecr.us-east-2.amazonaws.com/currentc-server:latest",
"cpu": 0,
"portMappings": [
{
"name": "currentc-server-8080-tcp",
"containerPort": 8080,
"hostPort": 8080,
"protocol": "tcp",
"appProtocol": "http"
}
],
"essential": true,
"environment": [],
"environmentFiles": [],
"mountPoints": [],
"volumesFrom": [],
"ulimits": [],
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-create-group": "true",
"awslogs-group": "/ecs/currentC-server",
"awslogs-region": "us-east-2",
"awslogs-stream-prefix": "ecs"
},
"secretOptions": []
},
"systemControls": []
}
],
"family": "currentC-server",
"executionRoleArn": "arn:aws:iam::525357733102:role/ecsTaskExecutionRole",
"networkMode": "awsvpc",
"revision": 8,
"volumes": [],
"status": "ACTIVE",
"requiresAttributes": [
{
"name": "com.amazonaws.ecs.capability.logging-driver.awslogs"
},
{
"name": "ecs.capability.execution-role-awslogs"
},
{
"name": "com.amazonaws.ecs.capability.ecr-auth"
},
{
"name": "com.amazonaws.ecs.capability.docker-remote-api.1.19"
},
{
"name": "ecs.capability.execution-role-ecr-pull"
},
{
"name": "com.amazonaws.ecs.capability.docker-remote-api.1.18"
},
{
"name": "ecs.capability.task-eni"
},
{
"name": "com.amazonaws.ecs.capability.docker-remote-api.1.29"
}
],
"placementConstraints": [],
"compatibilities": ["EC2", "FARGATE"],
"requiresCompatibilities": ["FARGATE"],
"cpu": "512",
"memory": "1024",
"runtimePlatform": {
"cpuArchitecture": "X86_64",
"operatingSystemFamily": "LINUX"
},
"registeredAt": "2024-04-17T20:36:46.964Z",
"registeredBy": "arn:aws:iam::525357733102:user/weiwang0305",
"tags": []
}
58 changes: 31 additions & 27 deletions server/server.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import express, { Express, NextFunction, Request, Response } from "express";
import dotenv from "dotenv";
import cors from "cors";
import bodyParser from "body-parser";
import supabase from "./utils/supabase";
import { ServerError } from "./types";
import { Server } from "socket.io";
import { createServer } from "node:http";
import express, { Express, NextFunction, Request, Response } from 'express';
import dotenv from 'dotenv';
import cors from 'cors';
import bodyParser from 'body-parser';
import supabase from './utils/supabase';
import { ServerError } from './types';
import { Server } from 'socket.io';
import { createServer } from 'node:http';

dotenv.config();

Expand All @@ -14,54 +14,58 @@ const app: Express = express();
const server = createServer(app);
const io = new Server(server, {
cors: {
origin: "http://localhost:3000",
methods: ["GET", "POST"],
origin: 'http://localhost:3000',
methods: ['GET', 'POST'],
},
});

app.use(bodyParser.urlencoded({ extended: false }));
app.use(cors());
app.use(bodyParser.json());

import userRouter from "./routers/userRouter";
import feedRouter from "./routers/feedRouter";
import settingsRouter from "./routers/settingsRouter";
import authRouter from "./routers/authRouter";
import messageRouter from "./routers/messageRouter";
import userRouter from './routers/userRouter';
import feedRouter from './routers/feedRouter';
import settingsRouter from './routers/settingsRouter';
import authRouter from './routers/authRouter';
import messageRouter from './routers/messageRouter';

app.use("/auth", authRouter);
app.use("/users", userRouter);
app.use("/feed", feedRouter);
app.use("/settings", settingsRouter);
app.use("/messages", messageRouter);
app.use('/auth', authRouter);
app.use('/users', userRouter);
app.use('/feed', feedRouter);
app.use('/settings', settingsRouter);
app.use('/messages', messageRouter);

app.use("/overview", async (req: Request, res: Response) => {
app.use('/overview', async (req: Request, res: Response) => {
const { data, error } = await supabase.auth.getSession();
// console.log('session', data);
});

app.get('/', (req: Request, res: Response) => {
res.status(200).json('working backend');
});

app.use((err: ServerError, req: Request, res: Response, next: NextFunction) => {
const errorObj: ServerError = Object.assign({}, err);

console.log(errorObj);
return res.status(errorObj.status).json({ error: errorObj });
});

io.on("connection", (socket) => {
io.on('connection', (socket) => {
console.log(`a user connected ${socket.id}}`);

socket.on("join_room", (data) => {
socket.on('join_room', (data) => {
const { chatId, user1, user2 } = data;
socket.join(chatId);
console.log(`user-${user1} joined room - ${chatId}`);
});

socket.on("send_message", (data) => {
io.in(data.chat_id).emit("receive_message", data);
socket.on('send_message', (data) => {
io.in(data.chat_id).emit('receive_message', data);
});

socket.on("disconnect", () => {
console.log("A user disconnected:", socket.id);
socket.on('disconnect', () => {
console.log('A user disconnected:', socket.id);
});
});

Expand Down

0 comments on commit b2ab035

Please sign in to comment.