Skip to content

Commit 2476c70

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/master'
2 parents f7346f2 + 66eb7dc commit 2476c70

File tree

6 files changed

+141
-3
lines changed

6 files changed

+141
-3
lines changed

.dockerignore

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# Logs
2+
logs
3+
*.log
4+
5+
# Runtime data
6+
pids
7+
*.pid
8+
*.seed
9+
10+
# Coverage directory used by tools like istanbul
11+
coverage
12+
.eslintcache
13+
14+
# Dependency directory
15+
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
16+
node_modules
17+
18+
# OSX
19+
.DS_Store
20+
21+
release/app/dist
22+
release/build
23+
.erb/dll
24+
25+
.idea
26+
npm-debug.log.*
27+
*.css.d.ts
28+
*.sass.d.ts
29+
*.scss.d.ts
30+
31+
32+
output/1.csv
33+
output/
34+
35+
package-mac.sh
36+
certificate.p12
37+
38+
39+
40+
41+
build/
42+
43+
/profiles/
44+
45+
/output/
46+
47+
/cache/
48+
49+
/error_logs/
50+
/task_results/
51+
52+
local_storage.json
53+
54+
db.sqlite3
55+
56+
**/.DS_Store
57+
task_results/
58+
todo.md
59+
temp.js
60+
db.nedb
61+
botasaurus_storage.json
62+
botasaurus_storage.json.temp
63+
last_task_id.txt
64+
# Sentry Config File
65+
.env.sentry-build-plugin
66+
67+
*.DS_Store
68+
**/__pycache__
69+
**/.DS_Store

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,7 @@ botasaurus_storage.json.temp
6363
last_task_id.txt
6464
# Sentry Config File
6565
.env.sentry-build-plugin
66+
67+
*.DS_Store
68+
**/__pycache__
69+
**/.DS_Store

Dockerfile

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
FROM node:20-bookworm-slim
2+
3+
ENV DEBIAN_FRONTEND=noninteractive \
4+
DISPLAY=:99
5+
6+
# Install system dependencies
7+
RUN apt-get update && apt-get install -y --no-install-recommends \
8+
wget \
9+
git \
10+
lsof \
11+
xvfb \
12+
gnupg \
13+
ca-certificates \
14+
&& rm -rf /var/lib/apt/lists/*
15+
16+
# Install Chromium (works on both AMD64 and ARM64)
17+
RUN apt-get update \
18+
&& apt-get install -y --no-install-recommends chromium \
19+
&& rm -rf /var/lib/apt/lists/* \
20+
&& ln -sf /usr/bin/chromium /usr/bin/google-chrome-stable \
21+
&& ln -sf /usr/bin/chromium /usr/bin/google-chrome
22+
23+
24+
# # Install Chrome dependencies
25+
# RUN apt-get update && apt-get install -y \
26+
# wget \
27+
# gnupg2 \
28+
# lsof \
29+
# apt-transport-https \
30+
# ca-certificates \
31+
# x11-utils xdg-utils xvfb \
32+
# software-properties-common \
33+
# && rm -rf /var/lib/apt/lists/*
34+
35+
# # Add the Google Chrome repository
36+
# RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
37+
# && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list
38+
39+
# # Install Google Chrome
40+
# RUN apt-get update && apt-get install -y google-chrome-stable \
41+
# && rm -rf /var/lib/apt/lists/*
42+
43+
44+
WORKDIR /app
45+
46+
COPY package*.json ./
47+
RUN npm install
48+
49+
COPY . .
50+
51+
EXPOSE 8000
52+
53+
# Start Xvfb and then the app
54+
CMD Xvfb :99 -ac -screen 0 1280x1024x16 & npm run k8s:worker

docker-compose.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
services:
2+
bot-1:
3+
restart: "no"
4+
shm_size: 800m
5+
build:
6+
dockerfile: Dockerfile
7+
context: .
8+
volumes:
9+
- .:/app
10+
ports:
11+
- "8000:8000"

release/app/package-lock.json

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

release/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "todo-my-app-name",
3-
"version": "1.27.0",
3+
"version": "1.28.0",
44
"description": "Todo my app description",
55
"license": "MIT",
66
"main": "./dist/main/main.js",

0 commit comments

Comments
 (0)