diff --git a/Dockerfile.app b/Dockerfile.app index 77830e9..e7ae19b 100644 --- a/Dockerfile.app +++ b/Dockerfile.app @@ -15,15 +15,10 @@ RUN pip install --no-cache-dir -r requirements.txt && \ # Copy the rest of the source code COPY instalinks/ /app/ COPY static /app/static -COPY nginx/etc/nginx/sites-available /etc/nginx/sites-available -COPY nginx/etc/nginx/snippets /etc/nginx/snippets +COPY nginx/etc/nginx/ /etc/nginx/ COPY running.sh /app/ COPY manage.py /app/ -ENV DB_USER=/run/secrets/DB_USER -ENV DB_PASSWORD=/run/secrets/DB_PASSWORD -ENV DB_NAME=/run/secrets/DB_NAME - # Set environment variables for Django ENV PYTHONUNBUFFERED 1 ENV DJANGO_SETTINGS_MODULE settings diff --git a/Dockerfile.db b/Dockerfile.db index 66ac94a..dc8b76c 100644 --- a/Dockerfile.db +++ b/Dockerfile.db @@ -1,16 +1,4 @@ -# docker build --secret id=DB_NAME --secret id=DB_USER \ -# --secret id=DB_PASSWORD -t instagram_links_db:0.0.1 . - FROM bitnami/postgresql:17.4.0-debian-12-r12 -# Set environment variables to override default credentials -#ENV POSTGRES_USER=DB_USER -#ENV POSTGRES_PASSWORD=DB_PASSWORD -#ENV POSTGRES_DB=DB_NAME - # Copy the SQL init script into the entrypoint directory COPY init.sql /docker-entrypoint-initdb.d/init.sql - -# The base image's entrypoint will automatically run -# any scripts in /docker-entrypoint-initdb.d/ -# No additional commands needed. \ No newline at end of file diff --git a/command b/command index dd24752..c5cddf4 100644 --- a/command +++ b/command @@ -25,7 +25,7 @@ cd /Users/o.vodianov/Documents/instalinks && python manage.py runserver cd /Users/o.vodianov/Documents/instalinks && gunicorn instalinks.wsgi:application docker run --rm --network app-net -v /Users/o.vodianov/Documents/database:/bitnami/postgresql/data/ --name instagram_links_db -p 5432:5432 -dt instagram_links_db:0.0.1 && \ -docker run --rm --network app-net --name instagram_links_app -p 8080:8080 -dt instagram_links_app:0.0.1 +docker run --rm --network app-net --name instagram_links_app -p 8080:8080 -dt instagram_links_app:0.0.1 docker save -o instagram_links_app_0.0.2.tar 4b39a3d30169