Dev #4

Merged
rezidir merged 3 commits from dev into release 2026-06-25 11:56:49 +03:00
4 changed files with 44 additions and 15 deletions
Showing only changes of commit efe68ef9a2 - Show all commits
+1 -11
View File
@@ -26,19 +26,9 @@ WORKDIR /app
# Copy the compiled executable from builder
COPY --from=builder /app/bin/server.exe ./bin/server.exe
# Copy the built Flutter web app
#Copy the built Flutter web app
COPY web/ ./web/
# Set environment variables
ENV PORT=9090
ENV POSTGRES_HOST=localhost
ENV POSTGRES_PORT=5432
ENV POSTGRES_DB=family_safety
ENV POSTGRES_USER=postgres
ENV POSTGRES_PASSWORD=postgres
ENV JWT_SECRET=your-super-secret-key-change-me
ENV TOKEN_LIFETIME=600
EXPOSE 9090
CMD ["./bin/server.exe"]
Vendored
+20
View File
@@ -0,0 +1,20 @@
pipeline {
agent any
options {
buildDiscarder(logRotator(numToKeepStr: '10'))
disableConcurrentBuilds()
timeout(time: 1, unit: 'MINUTES')
timestamps()
}
stages {
stage('Docker build') {
steps {
echo 'Docker build'
sh "docker build --no-cache -t geotracker ."
}
}
}
}
+1
View File
@@ -60,6 +60,7 @@ class AuthRoutes {
Future<Response> _register(Request request) async {
final stopwatch = Stopwatch()..start();
final body = await request.readAsString();
logRequest(method: 'POST', url: '/reg', status: 444, duration: stopwatch.elapsed, body: body);
final data = jsonDecode(body);
final login = data['login'];
+22 -4
View File
@@ -7,17 +7,35 @@ services:
restart: unless-stopped
volumes:
- postgres_data:/var/lib/postgresql/data
- ./data:/var/lib/postgresql/data
app:
build: .
image: geotracker
container_name: family_safety_app
restart: unless-stopped
ports:
- "9090:9090"
- "127.0.0.1:9090:9090"
depends_on:
db:
condition: service_healthy
- db
volumes:
postgres_data:
#services:
# db:
# image: postgres:16-alpine
# container_name: family_safety_db
# restart: unless-stopped
# volumes:
# - ./data:/var/lib/postgresql/data
#
# app:
# image: geotracker
# container_name: family_safety_app
# restart: unless-stopped
# ports:
# - "127.0.0.1:9090:9090"
# depends_on:
# - db