Skip to content

Commit

Permalink
protobuf websocket, websocket testing tool wip
Browse files Browse the repository at this point in the history
  • Loading branch information
Relacibo committed Sep 15, 2024
1 parent 9043b4e commit 3627d90
Show file tree
Hide file tree
Showing 25 changed files with 1,606 additions and 1,322 deletions.
8 changes: 8 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
RUN npm install --global yarn
RUN npm install --global dotenv-vault

# http://google.github.io/proto-lens/installing-protoc.html
ENV PROTOC_VERSION 3.14.0
ENV PROTOC_ZIP protoc-${PROTOC_VERSION}-linux-x86_64.zip
RUN curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/${PROTOC_ZIP}
RUN unzip -o $PROTOC_ZIP -d /usr/local bin/protoc && chmod +x /usr/local/bin/protoc
RUN unzip -o $PROTOC_ZIP -d /usr/local 'include/*' && chmod -R +r /usr/local/include/google
RUN rm -f $PROTOC_ZIP

USER vscode
RUN cargo install diesel_cli@^2.2 --no-default-features --features postgres
# RUN cargo install diesel_cli_ext@^0.3
Expand Down
5 changes: 3 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"password": "postgres"
}
],
"thunder-client.httpVersion": "HTTP/2",
"[sql]": {
"editor.defaultFormatter": null,
"editor.formatOnType": false
Expand All @@ -52,7 +51,9 @@
"mtxr.sqltools-driver-pg",
"rangav.vscode-thunder-client",
"EditorConfig.EditorConfig",
"eamodio.gitlens"
"eamodio.gitlens",
"fill-labs.dependi",
"zxh404.vscode-proto3"
]
}
},
Expand Down
12 changes: 6 additions & 6 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ services:
# Add "forwardPorts": ["5432"] to **devcontainer.json** to forward PostgreSQL locally.
# (Adding the "ports" property to this file will not forward from a Codespace.)

dragonfly:
image: cgr.dev/chainguard/dragonfly:latest
restart: unless-stopped
env_file:
.env
network_mode: host
# dragonfly:
# image: cgr.dev/chainguard/dragonfly:latest
# restart: unless-stopped
# env_file:
# .env
# network_mode: host
17 changes: 7 additions & 10 deletions .github/workflows/aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,34 +66,31 @@ jobs:
contents: read
packages: write
steps:
- name: Checkout
uses: actions/checkout@v4

- name: downcase image name
run: |
echo "FULL_IMAGE=${FULL_IMAGE_UPPER,,}" >>${GITHUB_ENV}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Log in to the Container registry
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ env.FULL_IMAGE }}
tags: |
type=sha,prefix=,format=long
latest
- name: Build and push Docker image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
context: .
push: true
Expand All @@ -103,7 +100,7 @@ jobs:
cache-from: type=gha,scope=p2pcv-server-${{github.ref_name}}

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v2
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ vars.AWS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
Expand All @@ -118,7 +115,7 @@ jobs:
image: ${{ env.FULL_IMAGE }}:${{ github.sha }}

- name: Deploy Amazon ECS task definition
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
uses: aws-actions/amazon-ecs-deploy-task-definition@v2
with:
task-definition: ${{ steps.task-def.outputs.task-definition }}
service: ${{ env.ECS_SERVICE }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/migrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
uses: actions/checkout@v4

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v2
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ vars.AWS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
Expand All @@ -115,7 +115,7 @@ jobs:
GIT_COMMIT=${{github.sha}}
- name: Run Task on Amazon ECS
uses: aws-actions/amazon-ecs-deploy-task-definition@abe77ebded86b685c231c58bd5936280c6fcc011 # Use commit, that has run-task support, until next release
uses: aws-actions/amazon-ecs-deploy-task-definition@v2
with:
task-definition: ${{ steps.task-def.outputs.task-definition }}
cluster: ${{ env.ECS_CLUSTER }}
Expand Down
Loading

0 comments on commit 3627d90

Please sign in to comment.