Skip to content

Commit 1e0230f

Browse files
authored
Merge pull request #200 from devforth/next
Next
2 parents 5c99974 + b8b97dc commit 1e0230f

File tree

6 files changed

+46
-7
lines changed

6 files changed

+46
-7
lines changed

adminforth/commands/createApp/main.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export default async function createApp(args) {
2222
await tasks.run();
2323
} catch (err) {
2424
console.error(chalk.red(`\n❌ ${err.message}\n`));
25+
console.error(err.stack);
2526
process.exit(1);
2627
}
2728
}

adminforth/commands/createApp/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ async function writeTemplateFiles(dirname, cwd, options) {
237237
src: '.dockerignore.hbs',
238238
dest: '.dockerignore',
239239
data: {
240-
sqliteFile: detectDbProvider(options.db).startsWith('sqlite') ? options.db.split('://')[1] : null,
240+
sqliteFile: detectDbProvider(dbUrl).startsWith('sqlite') ? dbUrl.split('://')[1] : null,
241241
},
242242
}
243243
];

adminforth/documentation/blog/2025-02-19-compose-ec2-deployment-ci-registry/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
slug: compose-ec2-deployment-github-actions-registry
3-
title: "Amazon EC2 Deployments with GitHub Actions, Terraform, Docker & Amazon ECR"
3+
title: "Amazon EC2 Deployments with GitHub Actions, Terraform, Docker & Self-hosted Registry"
44
authors: ivanb
55
tags: [aws, terraform, github-actions]
66
description: "The ultimate step-by-step guide to cost-effective, build-time-efficient, and easy managable EC2 deployments using GitHub Actions, Terraform, Docker, and a self-hosted registry."
@@ -108,7 +108,7 @@ Make sure you are not calling bundleNow in `index.ts` file for non-development m
108108
}
109109
```
110110

111-
### Step 1.3 - Make sure you have `migrateLiveAndStart` script in `package.json`
111+
### Step 1.3 - Make sure you have all required scripts in `package.json`
112112

113113
```json title="./myadmin/package.json"
114114
...

adminforth/documentation/blog/2025-02-19-compose-ec2-deployment-ecr-ci/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ image: "/ogs/ga-tf-ecr.jpg"
88
---
99

1010

11-
![alt text](ga-tf-aws.jpg)
11+
![alt text](ga-tf-ecr.jpg)
1212

1313

1414
This guide shows how to deploy own Docker apps (with AdminForth as example) to Amazon EC2 instance with Docker and Terraform involving pushing images into Amazon ECR.
@@ -40,7 +40,7 @@ Quick difference between approaches from previous post and current post:
4040
| How build happens | Source code is rsync-ed from CI to EC2 and docker build is done there | Docker build is done on CI and docker image is pushed to registry, then Docker on EC2 pulls from registry |
4141
| Where build is done | On EC2 | On CI |
4242
| How Docker build layers are cached | Cache is stored on EC2 | GitHub actions has no own Docker cache out of the box, so it should be stored in dedicated place (we use Amazon ECR) |
43-
| Advantages | Cheaper (no egrass traffik from EC2) and faster | Build is done on CI, so EC2 server is not overloaded |
43+
| Advantages | Cheaper (no egrass cache traffik from EC2) and faster | Build is done on CI, so EC2 server is not overloaded |
4444
| Disadvantages | Build on EC2 requires additional server RAM / requires swap / overloads CPU | More terraform code is needed. Extra cost for egress traffik to GitHub for cache transfer |
4545
| Initial build time\* | 3m 13.541s | 3m 54s |
4646
| Rebuild time (changed `index.ts`)\*| 0m 51.653s | 0m 54.120s |
@@ -98,7 +98,7 @@ Drawback is that buildx which is running on GitHub action server will download c
9898

9999
# Prerequisites
100100

101-
I will use you run Ubuntu (Native or WSL2).
101+
I will assume you run Ubuntu (Native or WSL2).
102102

103103
You should have terraform, here is official repository:
104104

adminforth/package-lock.json

Lines changed: 38 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

adminforth/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
"license": "ISC",
5959
"type": "module",
6060
"dependencies": {
61+
"@babel/parser": "^7.27.0",
6162
"@clickhouse/client": "^1.4.0",
6263
"@faker-js/faker": "^9.0.3",
6364
"@inquirer/prompts": "^7.4.1",

0 commit comments

Comments
 (0)