Skip to content
Snippets Groups Projects
Commit d7134919 authored by Tobias Mieves's avatar Tobias Mieves :sparkles:
Browse files

Merge branch 'develop' into 'main'

Fix permission in docker

See merge request !36
parents f5a28cce 7eff2886
No related branches found
No related tags found
2 merge requests!44Main,!36Fix permission in docker
Pipeline #241473 passed with warnings
...@@ -151,3 +151,4 @@ wedding/ ...@@ -151,3 +151,4 @@ wedding/
wishlist/ wishlist/
trips/ trips/
/static/core/css/output.css /static/core/css/output.css
/media/*
version: 25
jobs:
- name: Git Sync Push
steps:
- !PushRepository
name: Push to gitlab.fachschaften.org
remoteUrl: https://gitlab.fachschaften.org/tobiasff3200/django-core.git
userName: Tobias
passwordSecret: GitLab.Fachschaften.org_Sync_Token
force: false
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
triggers:
- !BranchUpdateTrigger {}
- !TagCreateTrigger {}
retryCondition: never
maxRetries: 3
retryDelay: 30
timeout: 3600
- name: Git Sync Pull
steps:
- !PullRepository
name: Pull from gitlab.fachschaften.org
remoteUrl: https://gitlab.fachschaften.org/tobiasff3200/django-core.git
syncToChildProject: false
userName: Tobias
passwordSecret: GitLab.Fachschaften.org_Sync_Token
refs: refs/heads/* refs/tags/*
withLfs: true
force: false
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
triggers:
- !ScheduleTrigger
cronExpression: 0 0 7/12 * * ? *
retryCondition: never
maxRetries: 3
retryDelay: 30
timeout: 3600
...@@ -2,12 +2,10 @@ FROM python:3.12 ...@@ -2,12 +2,10 @@ FROM python:3.12
WORKDIR /app WORKDIR /app
COPY requirements.txt requirements.txt COPY requirements.txt requirements.txt
RUN pip install -r requirements.txt RUN pip install --no-cache-dir -r requirements.txt
RUN rm requirements.txt
COPY . /app COPY . /app
RUN mkdir -p /app/db/ RUN mkdir -p /app/db/ && chmod +x /app/start.sh && rm requirements.txt && chown -R 1000:1000 /app
RUN chmod +x /app/start.sh
EXPOSE 8000
USER 1000 USER 1000
EXPOSE 8000
ENTRYPOINT ["./start.sh"] ENTRYPOINT ["./start.sh"]
start.sh 100644 → 100755
File mode changed from 100644 to 100755
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment