mirror of
https://github.com/DRYTRIX/TimeTracker.git
synced 2026-01-04 10:40:23 -06:00
update cert
This commit is contained in:
4
.github/workflows/build-and-publish.yml
vendored
4
.github/workflows/build-and-publish.yml
vendored
@@ -136,9 +136,9 @@ jobs:
|
||||
|
||||
## Docker Image
|
||||
|
||||
\`\`\`bash
|
||||
```bash
|
||||
docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
|
||||
\`\`\`
|
||||
```
|
||||
|
||||
## Your Choice
|
||||
|
||||
|
||||
2
.github/workflows/build-dev.yml
vendored
2
.github/workflows/build-dev.yml
vendored
@@ -3,8 +3,6 @@ name: Build Development Image
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
- develop
|
||||
- 'feature/**'
|
||||
pull_request:
|
||||
branches:
|
||||
|
||||
2
.github/workflows/cd-release.yml
vendored
2
.github/workflows/cd-release.yml
vendored
@@ -119,7 +119,7 @@ jobs:
|
||||
|
||||
- name: Run complete test suite
|
||||
env:
|
||||
DATABASE_URL: postgresql://test_user:test_password@localhost:5432/test_db
|
||||
DATABASE_URL: sqlite:///:memory:
|
||||
FLASK_APP: app.py
|
||||
FLASK_ENV: testing
|
||||
PYTHONPATH: ${{ github.workspace }}
|
||||
|
||||
11
Dockerfile
11
Dockerfile
@@ -68,6 +68,9 @@ RUN --mount=type=cache,target=/root/.cache/pip \
|
||||
# Copy project files
|
||||
COPY . .
|
||||
|
||||
# Also install certificate generation script to a stable path used by docs/compose
|
||||
COPY scripts/generate-certs.sh /scripts/generate-certs.sh
|
||||
|
||||
# Copy compiled assets from frontend stage (overwriting the stale one from COPY .)
|
||||
COPY --from=frontend /app/app/static/dist/output.css /app/app/static/dist/output.css
|
||||
|
||||
@@ -89,7 +92,7 @@ COPY docker/start-fixed.py /app/start.py
|
||||
|
||||
# Fix line endings and set permissions in a single layer
|
||||
RUN find /app/docker -name "*.sh" -o -name "*.py" | xargs dos2unix 2>/dev/null || true \
|
||||
&& dos2unix /app/start.py 2>/dev/null || true \
|
||||
&& dos2unix /app/start.py /scripts/generate-certs.sh 2>/dev/null || true \
|
||||
&& chmod +x \
|
||||
/app/start.py \
|
||||
/app/docker/init-database.py \
|
||||
@@ -107,7 +110,8 @@ RUN find /app/docker -name "*.sh" -o -name "*.py" | xargs dos2unix 2>/dev/null |
|
||||
/app/docker/startup_with_migration.py \
|
||||
/app/docker/test_db_connection.py \
|
||||
/app/docker/debug_startup.sh \
|
||||
/app/docker/simple_test.sh
|
||||
/app/docker/simple_test.sh \
|
||||
/scripts/generate-certs.sh
|
||||
|
||||
# Create non-root user and set ownership
|
||||
RUN useradd -m -u 1000 timetracker \
|
||||
@@ -118,7 +122,8 @@ RUN useradd -m -u 1000 timetracker \
|
||||
/app/instance \
|
||||
/app/app/static/uploads \
|
||||
/app/static/uploads \
|
||||
/app/translations
|
||||
/app/translations \
|
||||
/scripts
|
||||
|
||||
USER timetracker
|
||||
|
||||
|
||||
Reference in New Issue
Block a user