Skip to content

Commit 97d3557

Browse files
committed
build: update to alpine:3.23 and Node.js 24
1 parent e0dac85 commit 97d3557

File tree

6 files changed

+26
-29
lines changed

6 files changed

+26
-29
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ dist
66
Dockerfile
77
node_modules
88
test
9+
tsconfig.json
910

1011
botfather-settings
1112
init-debug-environment.sh

.github/workflows/nodejs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212
timeout-minutes: 15
1313
steps:
14-
- uses: actions/setup-node@v5
14+
- uses: actions/setup-node@v6
1515
with:
16-
node-version: 22
17-
- uses: actions/checkout@v5
16+
node-version: 24
17+
- uses: actions/checkout@v6
1818
- run: npm ci
1919
- run: npm test

Dockerfile

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
1-
FROM docker.io/library/alpine:3.22 AS builder
2-
RUN apk upgrade --no-cache \
3-
&& apk add --no-cache npm
4-
WORKDIR /build
5-
COPY package.json package-lock.json ./
6-
RUN npm ci --no-audit --no-fund --no-update-notifier
7-
COPY . ./
8-
RUN node_modules/.bin/tsc
9-
10-
11-
FROM docker.io/library/alpine:3.22 AS packages
1+
FROM docker.io/library/alpine:3.23 AS packages
122
RUN apk upgrade --no-cache \
133
&& apk add --no-cache npm
144
WORKDIR /build
155
COPY package.json package-lock.json ./
166
RUN npm ci --no-audit --no-fund --no-update-notifier --omit=dev
177

188

19-
FROM docker.io/library/alpine:3.22 AS final
9+
FROM docker.io/library/alpine:3.23 AS final
2010
RUN apk upgrade --no-cache \
2111
&& apk add --no-cache nodejs git
2212

@@ -30,7 +20,7 @@ VOLUME /app/userconfig
3020
COPY package.json ./
3121
COPY --from=packages /build/node_modules ./node_modules
3222
COPY locales locales
33-
COPY --from=builder /build/dist ./
23+
COPY source ./
3424

3525
ENTRYPOINT ["node", "--enable-source-maps"]
36-
CMD ["hawhh-calendarbot-telegrambot.js"]
26+
CMD ["hawhh-calendarbot-telegrambot.ts"]

package-lock.json

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

package.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,17 @@
88
"url": "https://github.com/HAWHHCalendarBot/telegrambot.git"
99
},
1010
"scripts": {
11-
"start": "tsc && node --env-file-if-exists=.env --enable-source-maps dist/hawhh-calendarbot-telegrambot.js",
11+
"start": "node --env-file-if-exists=.env --enable-source-maps source/hawhh-calendarbot-telegrambot.ts",
1212
"test": "tsc && xo && node --enable-source-maps --test"
1313
},
1414
"type": "module",
1515
"engines": {
16-
"node": ">=22"
16+
"node": ">=24"
17+
},
18+
"devEngines": {
19+
"packageManager": {
20+
"name": "npm"
21+
}
1722
},
1823
"dependencies": {
1924
"@grammyjs/i18n": "^1.1.2",
@@ -26,7 +31,7 @@
2631
"telegram-format": "^3.1.0"
2732
},
2833
"devDependencies": {
29-
"@types/node": "^22.17.1",
34+
"@types/node": "^24.10.1",
3035
"typescript": "^5.9.2",
3136
"xo": "^1.2.1"
3237
},

tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"libReplacement": false,
77
"module": "node20",
88
"moduleDetection": "force",
9+
"noEmit": true,
910
"noEmitOnError": true,
1011
"noFallthroughCasesInSwitch": true,
1112
"noImplicitOverride": true,

0 commit comments

Comments
 (0)