From fab409a4e7f98c2765d2c1c1f520ae22759256b0 Mon Sep 17 00:00:00 2001 From: Devin Ivy Date: Wed, 19 Jun 2024 14:59:51 -0400 Subject: [PATCH] bskyogcard: rename from bskycard --- ...card-aws.yaml => build-and-push-ogcard-aws.yaml} | 8 ++++---- Dockerfile.bskycard => Dockerfile.bskyogcard | 6 +++--- bskycard/src/logger.ts | 3 --- {bskycard => bskyogcard}/package.json | 3 ++- {bskycard => bskyogcard}/src/assets/Inter-Bold.ttf | Bin {bskycard => bskyogcard}/src/bin.ts | 0 .../src/components/Butterfly.tsx | 0 {bskycard => bskyogcard}/src/components/Img.tsx | 0 .../src/components/StarterPack.tsx | 0 {bskycard => bskyogcard}/src/config.ts | 0 {bskycard => bskyogcard}/src/context.ts | 0 {bskycard => bskyogcard}/src/index.ts | 0 bskyogcard/src/logger.ts | 3 +++ {bskycard => bskyogcard}/src/routes/health.ts | 0 {bskycard => bskyogcard}/src/routes/index.ts | 0 .../src/routes/starter-pack.tsx | 0 {bskycard => bskyogcard}/src/routes/util.ts | 0 {bskycard => bskyogcard}/tsconfig.json | 0 {bskycard => bskyogcard}/yarn.lock | 0 19 files changed, 12 insertions(+), 11 deletions(-) rename .github/workflows/{build-and-push-bskycard-aws.yaml => build-and-push-ogcard-aws.yaml} (92%) rename Dockerfile.bskycard => Dockerfile.bskyogcard (92%) delete mode 100644 bskycard/src/logger.ts rename {bskycard => bskyogcard}/package.json (86%) rename {bskycard => bskyogcard}/src/assets/Inter-Bold.ttf (100%) rename {bskycard => bskyogcard}/src/bin.ts (100%) rename {bskycard => bskyogcard}/src/components/Butterfly.tsx (100%) rename {bskycard => bskyogcard}/src/components/Img.tsx (100%) rename {bskycard => bskyogcard}/src/components/StarterPack.tsx (100%) rename {bskycard => bskyogcard}/src/config.ts (100%) rename {bskycard => bskyogcard}/src/context.ts (100%) rename {bskycard => bskyogcard}/src/index.ts (100%) create mode 100644 bskyogcard/src/logger.ts rename {bskycard => bskyogcard}/src/routes/health.ts (100%) rename {bskycard => bskyogcard}/src/routes/index.ts (100%) rename {bskycard => bskyogcard}/src/routes/starter-pack.tsx (100%) rename {bskycard => bskyogcard}/src/routes/util.ts (100%) rename {bskycard => bskyogcard}/tsconfig.json (100%) rename {bskycard => bskyogcard}/yarn.lock (100%) diff --git a/.github/workflows/build-and-push-bskycard-aws.yaml b/.github/workflows/build-and-push-ogcard-aws.yaml similarity index 92% rename from .github/workflows/build-and-push-bskycard-aws.yaml rename to .github/workflows/build-and-push-ogcard-aws.yaml index f5932ea193..5d6ff041d3 100644 --- a/.github/workflows/build-and-push-bskycard-aws.yaml +++ b/.github/workflows/build-and-push-ogcard-aws.yaml @@ -1,4 +1,4 @@ -name: build-and-push-bskycard-aws +name: build-and-push-ogcard-aws on: push: branches: @@ -8,10 +8,10 @@ env: REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }} USERNAME: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_USERNAME }} PASSWORD: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_PASSWORD }} - IMAGE_NAME: bskycard + IMAGE_NAME: bskyogcard jobs: - bskycard-container-aws: + ogcard-container-aws: if: github.repository == 'bluesky-social/social-app' runs-on: ubuntu-latest permissions: @@ -48,7 +48,7 @@ jobs: with: context: . push: ${{ github.event_name != 'pull_request' }} - file: ./Dockerfile.bskycard + file: ./Dockerfile.bskyogcard tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha diff --git a/Dockerfile.bskycard b/Dockerfile.bskyogcard similarity index 92% rename from Dockerfile.bskycard rename to Dockerfile.bskyogcard index 406f98dd4f..aa68add595 100644 --- a/Dockerfile.bskycard +++ b/Dockerfile.bskyogcard @@ -3,11 +3,11 @@ FROM node:20.11-alpine3.18 as build # Move files into the image and install WORKDIR /app -COPY ./bskycard/package.json ./ -COPY ./bskycard/yarn.lock ./ +COPY ./bskyogcard/package.json ./ +COPY ./bskyogcard/yarn.lock ./ RUN yarn install --frozen-lockfile -COPY ./bskycard ./ +COPY ./bskyogcard ./ # build then prune dev deps RUN yarn build diff --git a/bskycard/src/logger.ts b/bskycard/src/logger.ts deleted file mode 100644 index 465bf674bd..0000000000 --- a/bskycard/src/logger.ts +++ /dev/null @@ -1,3 +0,0 @@ -import {subsystemLogger} from '@atproto/common' - -export const httpLogger = subsystemLogger('bskycard') diff --git a/bskycard/package.json b/bskyogcard/package.json similarity index 86% rename from bskycard/package.json rename to bskyogcard/package.json index 05e27276dc..3be1337fc3 100644 --- a/bskycard/package.json +++ b/bskyogcard/package.json @@ -1,9 +1,10 @@ { - "name": "bskycard", + "name": "bskyogcard", "version": "0.0.0", "type": "module", "main": "src/index.ts", "scripts": { + "start": "node --loader ts-node/esm ./src/bin.ts", "build": "tsc && cp -r src/assets dist/assets" }, "dependencies": { diff --git a/bskycard/src/assets/Inter-Bold.ttf b/bskyogcard/src/assets/Inter-Bold.ttf similarity index 100% rename from bskycard/src/assets/Inter-Bold.ttf rename to bskyogcard/src/assets/Inter-Bold.ttf diff --git a/bskycard/src/bin.ts b/bskyogcard/src/bin.ts similarity index 100% rename from bskycard/src/bin.ts rename to bskyogcard/src/bin.ts diff --git a/bskycard/src/components/Butterfly.tsx b/bskyogcard/src/components/Butterfly.tsx similarity index 100% rename from bskycard/src/components/Butterfly.tsx rename to bskyogcard/src/components/Butterfly.tsx diff --git a/bskycard/src/components/Img.tsx b/bskyogcard/src/components/Img.tsx similarity index 100% rename from bskycard/src/components/Img.tsx rename to bskyogcard/src/components/Img.tsx diff --git a/bskycard/src/components/StarterPack.tsx b/bskyogcard/src/components/StarterPack.tsx similarity index 100% rename from bskycard/src/components/StarterPack.tsx rename to bskyogcard/src/components/StarterPack.tsx diff --git a/bskycard/src/config.ts b/bskyogcard/src/config.ts similarity index 100% rename from bskycard/src/config.ts rename to bskyogcard/src/config.ts diff --git a/bskycard/src/context.ts b/bskyogcard/src/context.ts similarity index 100% rename from bskycard/src/context.ts rename to bskyogcard/src/context.ts diff --git a/bskycard/src/index.ts b/bskyogcard/src/index.ts similarity index 100% rename from bskycard/src/index.ts rename to bskyogcard/src/index.ts diff --git a/bskyogcard/src/logger.ts b/bskyogcard/src/logger.ts new file mode 100644 index 0000000000..04b5d90469 --- /dev/null +++ b/bskyogcard/src/logger.ts @@ -0,0 +1,3 @@ +import {subsystemLogger} from '@atproto/common' + +export const httpLogger = subsystemLogger('bskyogcard') diff --git a/bskycard/src/routes/health.ts b/bskyogcard/src/routes/health.ts similarity index 100% rename from bskycard/src/routes/health.ts rename to bskyogcard/src/routes/health.ts diff --git a/bskycard/src/routes/index.ts b/bskyogcard/src/routes/index.ts similarity index 100% rename from bskycard/src/routes/index.ts rename to bskyogcard/src/routes/index.ts diff --git a/bskycard/src/routes/starter-pack.tsx b/bskyogcard/src/routes/starter-pack.tsx similarity index 100% rename from bskycard/src/routes/starter-pack.tsx rename to bskyogcard/src/routes/starter-pack.tsx diff --git a/bskycard/src/routes/util.ts b/bskyogcard/src/routes/util.ts similarity index 100% rename from bskycard/src/routes/util.ts rename to bskyogcard/src/routes/util.ts diff --git a/bskycard/tsconfig.json b/bskyogcard/tsconfig.json similarity index 100% rename from bskycard/tsconfig.json rename to bskyogcard/tsconfig.json diff --git a/bskycard/yarn.lock b/bskyogcard/yarn.lock similarity index 100% rename from bskycard/yarn.lock rename to bskyogcard/yarn.lock