Skip to content

Commit 4ec1ff1

Browse files
committed
init config
1 parent b45115e commit 4ec1ff1

4 files changed

Lines changed: 69 additions & 11 deletions

File tree

‎android/app/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313
compileSdk = 37
1414

1515
defaultConfig {
16-
applicationId = "com.httpsms"
16+
applicationId = "com.coremaster.httpsms"
1717
minSdk = 28
1818
targetSdk = 37
1919
versionCode = 1

‎android/app/google-services.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
"client_info": {
1010
"mobilesdk_app_id": "1:877524083399:android:5ceb08a909fd24a96514e2",
1111
"android_client_info": {
12-
"package_name": "com.httpsms"
12+
"package_name": "com.coremaster.httpsms"
1313
}
1414
},
1515
"oauth_client": [
1616
{
1717
"client_id": "877524083399-londfmd80qqlb2gebpbhctavlmqtla3b.apps.googleusercontent.com",
1818
"client_type": 1,
1919
"android_info": {
20-
"package_name": "com.httpsms",
20+
"package_name": "com.coremaster.httpsms",
2121
"certificate_hash": "58df9f7489b8bb5e3cd57f01a03d5e0068d8c185"
2222
}
2323
},

‎docker-compose.yml‎

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ services:
77
POSTGRES_USER: dbusername
88
volumes:
99
- postgres:/var/lib/postgresql/data
10-
ports:
11-
- "5435:5432"
10+
# No publicar Postgres al host en Dokploy (solo red interna)
11+
expose:
12+
- "5432"
1213
restart: on-failure
1314
healthcheck:
1415
test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
@@ -22,31 +23,53 @@ services:
2223
command: redis-server
2324
volumes:
2425
- redis:/var/lib/redis
25-
ports:
26-
- "6379:6379"
26+
expose:
27+
- "6379"
2728
restart: on-failure
2829

2930
api:
3031
build:
3132
context: ./api
33+
# Dokploy: un solo Environment del compose → archivo .env en la raíz del proyecto
34+
env_file:
35+
- .env
3236
ports:
3337
- "8000:8000"
3438
depends_on:
3539
postgres:
3640
condition: service_healthy
3741
redis:
3842
condition: service_started
39-
env_file:
40-
- ./api/.env
43+
restart: on-failure
4144

4245
web:
4346
build:
4447
context: ./web
48+
# Nuxt se genera en build: estas vars deben existir en el Environment de Dokploy
49+
args:
50+
API_BASE_URL: ${API_BASE_URL}
51+
APP_URL: ${APP_URL}
52+
APP_NAME: ${APP_NAME:-httpSMS}
53+
APP_GITHUB_URL: ${APP_GITHUB_URL:-https://github.com/NdoleStudio/httpsms}
54+
APP_DOCUMENTATION_URL: ${APP_DOCUMENTATION_URL:-https://docs.httpsms.com}
55+
APP_DOWNLOAD_URL: ${APP_DOWNLOAD_URL:-}
56+
APP_ENV: ${APP_ENV:-production}
57+
CLOUDFLARE_TURNSTILE_SITE_KEY: ${CLOUDFLARE_TURNSTILE_SITE_KEY:-}
58+
PUSHER_KEY: ${PUSHER_KEY:-}
59+
PUSHER_CLUSTER: ${PUSHER_CLUSTER:-}
60+
FIREBASE_API_KEY: ${FIREBASE_API_KEY}
61+
FIREBASE_AUTH_DOMAIN: ${FIREBASE_AUTH_DOMAIN}
62+
FIREBASE_PROJECT_ID: ${FIREBASE_PROJECT_ID}
63+
FIREBASE_STORAGE_BUCKET: ${FIREBASE_STORAGE_BUCKET}
64+
FIREBASE_MESSAGING_SENDER_ID: ${FIREBASE_MESSAGING_SENDER_ID}
65+
FIREBASE_APP_ID: ${FIREBASE_APP_ID}
66+
FIREBASE_MEASUREMENT_ID: ${FIREBASE_MEASUREMENT_ID:-}
4567
ports:
4668
- "3000:3000"
4769
depends_on:
4870
api:
4971
condition: service_started
72+
restart: on-failure
5073

5174
volumes:
5275
redis:

‎web/Dockerfile‎

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,45 @@ FROM node:22-alpine AS build
33

44
WORKDIR /app
55

6+
# Inyectadas desde docker-compose build.args ← Environment de Dokploy (.env raíz)
7+
ARG API_BASE_URL
8+
ARG APP_URL
9+
ARG APP_NAME
10+
ARG APP_GITHUB_URL
11+
ARG APP_DOCUMENTATION_URL
12+
ARG APP_DOWNLOAD_URL
13+
ARG APP_ENV
14+
ARG CLOUDFLARE_TURNSTILE_SITE_KEY
15+
ARG PUSHER_KEY
16+
ARG PUSHER_CLUSTER
17+
ARG FIREBASE_API_KEY
18+
ARG FIREBASE_AUTH_DOMAIN
19+
ARG FIREBASE_PROJECT_ID
20+
ARG FIREBASE_STORAGE_BUCKET
21+
ARG FIREBASE_MESSAGING_SENDER_ID
22+
ARG FIREBASE_APP_ID
23+
ARG FIREBASE_MEASUREMENT_ID
24+
25+
ENV API_BASE_URL=$API_BASE_URL \
26+
APP_URL=$APP_URL \
27+
APP_NAME=$APP_NAME \
28+
APP_GITHUB_URL=$APP_GITHUB_URL \
29+
APP_DOCUMENTATION_URL=$APP_DOCUMENTATION_URL \
30+
APP_DOWNLOAD_URL=$APP_DOWNLOAD_URL \
31+
APP_ENV=$APP_ENV \
32+
CLOUDFLARE_TURNSTILE_SITE_KEY=$CLOUDFLARE_TURNSTILE_SITE_KEY \
33+
PUSHER_KEY=$PUSHER_KEY \
34+
PUSHER_CLUSTER=$PUSHER_CLUSTER \
35+
FIREBASE_API_KEY=$FIREBASE_API_KEY \
36+
FIREBASE_AUTH_DOMAIN=$FIREBASE_AUTH_DOMAIN \
37+
FIREBASE_PROJECT_ID=$FIREBASE_PROJECT_ID \
38+
FIREBASE_STORAGE_BUCKET=$FIREBASE_STORAGE_BUCKET \
39+
FIREBASE_MESSAGING_SENDER_ID=$FIREBASE_MESSAGING_SENDER_ID \
40+
FIREBASE_APP_ID=$FIREBASE_APP_ID \
41+
FIREBASE_MEASUREMENT_ID=$FIREBASE_MEASUREMENT_ID
42+
643
COPY package.json pnpm-lock.yaml ./
744

8-
# Install pnpm
945
RUN npm install -g pnpm
1046

1147
RUN pnpm install
@@ -17,7 +53,6 @@ RUN pnpm run generate
1753
FROM nginx:stable-alpine AS production
1854
COPY --from=build /app/.output/public /usr/share/nginx/html
1955

20-
# Copy the nginx configuration file
2156
COPY ./nginx.conf /etc/nginx/conf.d/default.conf
2257

2358
EXPOSE 3000

0 commit comments

Comments
 (0)