chore: wip

Author: chrisbbreuer

README.md

@@ -35,7 +35,7 @@ It’s incredibly easy to get started with this framework. Simply run the follow
 ```bash
 curl -Ssf stacksjs.org/install | sh # wip
 
-# alternatively, if Bun >= v1.1.20 is installed already,
+# alternatively, if Bun >= v1.1.21 is installed already,
 # you may also get started via:
 bunx stacks new my-project
 ```

bun.lockb

@@ -21,7 +21,7 @@ export default {
     prefix: env.API_PREFIX || 'api',
     // version: 'v1',
     description: 'My awesome Stacks API',
-    deploy: true,
+    deploy: false,
     memorySize: 512,
     prewarm: 10,
     timeout: 30,

config/cloud.ts

@@ -9,7 +9,7 @@
 # https://stacksjs.org/docs/dependency-management
 
 dependencies:
-  bun.sh: ^1.1.20
+  bun.sh: ^1.1.21
   aws.amazon.com/cli: ^2.17.13
   dns.lookup.dog: ^0.1.0
   info-zip.org/zip: ^3.0

pkgx.yaml

@@ -5,7 +5,7 @@ FROM oven/bun:1 AS base
 WORKDIR /usr/src/app
 
 # Install curl - I wonder if there is a better way to do this, because it is only needed for the healthcheck — is wget installed by default?
-RUN apt-get update && apt-get install -y curl
+RUN apt-get update && apt-get install -y curl rsync
 
 # install dependencies into temp directory
 # this will cache them and speed up future builds
@@ -41,15 +41,20 @@ COPY . .
 # copy production dependencies and source code into final image
 FROM base AS release
 COPY --from=install /temp/prod/node_modules ./node_modules
-COPY --from=prerelease /usr/src/app/app ./app
-COPY --from=prerelease /usr/src/app/config ./config
-COPY --from=prerelease /usr/src/app/core ./core
-COPY --from=prerelease /usr/src/app/docs ./docs
-COPY --from=prerelease /usr/src/app/routes ./routes
-COPY --from=prerelease /usr/src/app/storage ./storage
-COPY --from=prerelease /usr/src/app/index.ts ./index.ts
-COPY --from=prerelease /usr/src/app/tsconfig.json ./tsconfig.json
-COPY --from=prerelease /usr/src/app/package.json ./package.json
+
+# Use rsync to copy files while respecting .gitignore and .dockerignore
+# https://unix.stackexchange.com/questions/168561/rsync-folder-while-exclude-froming-gitignore-files-at-different-depths
+RUN rsync --filter='dir-merge,-n /.gitignore' /usr/src/app/ /usr/src/app_release/
+
+COPY --from=prerelease /usr/src/app_release/app ./app
+COPY --from=prerelease /usr/src/app_release/config ./config
+COPY --from=prerelease /usr/src/app_release/core ./core
+COPY --from=prerelease /usr/src/app_release/docs ./docs
+COPY --from=prerelease /usr/src/app_release/routes ./routes
+COPY --from=prerelease /usr/src/app_release/storage ./storage
+COPY --from=prerelease /usr/src/app_release/index.ts ./index.ts
+COPY --from=prerelease /usr/src/app_release/tsconfig.json ./tsconfig.json
+COPY --from=prerelease /usr/src/app_release/package.json ./package.json
 
 # Add volume for logs
 VOLUME ["/mnt/efs"]

storage/framework/cloud/Dockerfile

@@ -1,8 +1,9 @@
 import process from 'node:process'
 import { log, runCommand } from '@stacksjs/cli'
-import { app } from '@stacksjs/config'
+import { app, cloud as cloudConfig } from '@stacksjs/config'
 import { frameworkPath, projectPath } from '@stacksjs/path'
 import { hasFiles } from '@stacksjs/storage'
+import { cloud } from '../core/buddy/src'
 
 // import { slug } from '@stacksjs/strings'
 
@@ -55,7 +56,8 @@ async function buildServer() {
 
 async function main() {
   useCustomOrDefaultServerConfig()
-  await buildServer()
+  if (cloudConfig.api?.deploy)
+    await buildServer()
 }
 
 main().catch((error) => {

storage/framework/cloud/build.ts

@@ -39,7 +39,7 @@
   "files": ["README.md", "dist", "src"],
   "scripts": {
     "bootstrap": "bunx cdk bootstrap",
-    "deploy": "cd .. && bun run build && cd ./docs && bun run build && cd ../core/cloud && bunx cdk deploy --require-approval never",
+    "deploy": "cd .. && bun run build && cd ./docs && bun run build && cd ../cloud && bunx cdk deploy --require-approval never",
     "dev": "./dev local",
     "dev:container": "docker run -d -p 3000:3000 stacks",
     "build": "bun build.ts"

storage/framework/cloud/package.json

@@ -50,13 +50,14 @@ export class ComputeStack {
       },
     })
 
-    const assetImage = new ecr_assets.DockerImageAsset(scope, 'DockerImageAsset', {
-      directory: p.frameworkPath('cloud'),
-    })
+    // const assetImage = new ecr_assets.DockerImageAsset(scope, 'DockerImageAsset', {
+    //   directory: p.frameworkPath('cloud'),
+    // })
 
     const container = this.taskDefinition.addContainer('WebServerContainer', {
       containerName: `${props.appName}-${props.appEnv}-api`,
-      image: ecs.ContainerImage.fromDockerImageAsset(assetImage),
+      // image: ecs.ContainerImage.fromDockerImageAsset(assetImage),
+      image: ecs.ContainerImage.fromAsset(p.frameworkPath('cloud')),
       logging: new ecs.AwsLogDriver({
         streamPrefix: `${props.appName}-${props.appEnv}-web-server-logs`,
         logGroup: new LogGroup(scope, 'StacksApiLogs', {