Dockerization #1

Merged
kirby merged 5 commits from dockerisation into main 2023-04-05 11:42:19 +02:00
3 changed files with 10 additions and 9 deletions
Showing only changes of commit cbd779fd93 - Show all commits

View File

@ -7,15 +7,15 @@ ARG APP_GID=1000
ENV PYTHONDONTWRITEBYTECODE 1 ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED 1 ENV PYTHONUNBUFFERED 1
WORKDIR /app/
RUN apt update && apt install -y netcat libmariadb-dev-compat libmariadb-dev mariadb-client gcc
COPY ./docker/scripts/entrypoint.sh /usr/local/bin/entrypoint COPY ./docker/scripts/entrypoint.sh /usr/local/bin/entrypoint
RUN chmod +x /usr/local/bin/entrypoint RUN chmod +x /usr/local/bin/entrypoint
WORKDIR /app/
RUN addgroup --system gunicorn --gid ${APP_GID} && adduser --uid ${APP_UID} --system --disabled-login --group gunicorn RUN addgroup --system gunicorn --gid ${APP_GID} && adduser --uid ${APP_UID} --system --disabled-login --group gunicorn
RUN apt update && apt install -y netcat libmariadb-dev-compat libmariadb-dev mariadb-client gcc
RUN pip install --upgrade pip RUN pip install --upgrade pip
COPY ./app/requirements.txt . COPY ./app/requirements.txt .
RUN pip install -r requirements.txt RUN pip install -r requirements.txt
@ -23,12 +23,10 @@ RUN pip install -r requirements.txt
COPY ./app/ . COPY ./app/ .
COPY ./app/updatesdashboard/.env.dev ./updatesdashboard/.env COPY ./app/updatesdashboard/.env.dev ./updatesdashboard/.env
#ENTRYPOINT tail -f /dev/null
RUN python /app/manage.py makemigrations RUN python /app/manage.py makemigrations
RUN python /app/manage.py makemigrations dashboard RUN python /app/manage.py makemigrations dashboard
RUN python /app/manage.py collectstatic RUN python /app/manage.py collectstatic
RUN rm -f ./updatesdashboard/.env RUN rm -f ./updatesdashboard/.env
ENTRYPOINT tail -f /dev/null
#ENTRYPOINT ["/usr/local/bin/gunicorn","/app/manage.py","updatesdashboard.wsgi:application"] ENTRYPOINT ["/usr/local/bin/entrypoint","mysql","3306"]

View File

@ -28,7 +28,7 @@ services:
- "3306:3306" - "3306:3306"
networks: networks:
- updates-dashboard-network - updates-dashboard-network
networks: networks:
updates-dashboard-network: updates-dashboard-network:
driver: bridge driver: bridge

View File

@ -1,2 +1,5 @@
#!/bin/sh #!/bin/sh
until nc -vz $1 $2; do echo "Waiting for MySQL $1:$2..."; sleep 3; done; until nc -vz $1 $2; do echo "Waiting for MySQL $1:$2..."; sleep 3; done;
python /app/manage.py migrate
python /app/manage.py loaddata dashboard/fixtures/os.yaml