Skip to content

Commit e0837ae

Browse files
author
Emile Frey
committed
cleanup of docker files and updated readme
1 parent 6b8d70a commit e0837ae

File tree

3 files changed

+4
-72
lines changed

3 files changed

+4
-72
lines changed

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ Install Docker Desktop
55

66
## Installation
77

8-
There are 3 .env files provided. Note in particular the .env files in backend\ and postgres\; there, you can adjust the database credentials, debug mode, secret key, allowed hosts, etc. But things should run just fine without any changes, but just know these files are there.
8+
There are 3 .env files provided. Note in particular the .env files in backend/ and postgres/; there, you can adjust the database credentials, debug mode, secret key, allowed hosts, etc. But things should run just fine without any changes, but just know these files are there.
9+
10+
**_NOTE: If you change your database name/credentials, but have already run the steps below, you may need to delete the associated postgres docker image in order to get things to work._**
11+
912

1013
For development mode without NGINX server, run the following command:
1114

backend/Dockerfile

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,3 @@
1-
# ###########
2-
# # BUILDER #
3-
# ###########
4-
5-
# # pull official base image
6-
# FROM python:3.7.9-slim-stretch as builder
7-
8-
# # set work directory
9-
# WORKDIR /usr/src/app
10-
11-
# # set environment variables
12-
# ENV PYTHONDONTWRITEBYTECODE 1
13-
# ENV PYTHONUNBUFFERED 1
14-
15-
# # install dependencies
16-
# COPY ./requirements.txt .
17-
# RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels -r requirements.txt
18-
19-
20-
# #########
21-
# # FINAL #
22-
# #########
23-
24-
# # pull official base image
25-
# FROM python:3.7.9-slim-stretch
26-
27-
# # installing netcat (nc) since we are using that to listen to postgres server in entrypoint.sh
28-
# RUN apt-get update && apt-get install -y --no-install-recommends netcat && \
29-
# apt-get autoremove -y && \
30-
# apt-get clean && \
31-
# rm -rf /var/lib/apt/lists/*
32-
33-
# # install dependencies
34-
# COPY --from=builder /usr/src/app/wheels /wheels
35-
# COPY --from=builder /usr/src/app/requirements.txt .
36-
# RUN pip install --no-cache /wheels/*
37-
38-
# # set work directory
39-
# WORKDIR /usr/src/app
40-
41-
# # copy entrypoint.sh
42-
# COPY ./entrypoint.sh /usr/src/app/entrypoint.sh
43-
44-
# # copy our django project
45-
# COPY ./django_app .
46-
47-
# # run entrypoint.sh
48-
# RUN chmod +x /usr/src/app/entrypoint.sh
49-
# ENTRYPOINT ["/usr/src/app/entrypoint.sh"]
50-
51-
521
# Use an official Python runtime as a parent image
532
FROM python:3.8
543

frontend/Dockerfile.local

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
1-
# FROM node:12.18.3-alpine3.9
2-
3-
# # set working directory
4-
# WORKDIR /app/react_app
5-
6-
# # add `/usr/src/app/node_modules/.bin` to $PATH
7-
# ENV PATH /app/node_modules/.bin:$PATH
8-
9-
# # install app dependencies
10-
# COPY ./react_app/package.json .
11-
# COPY ./react_app/package-lock.json .
12-
# RUN npm install react-scripts@3.4.1 -g
13-
# RUN npm install
14-
15-
# # copy the client directory into the container
16-
# COPY . .
17-
18-
19-
# Use an official node runtime as a parent image
20-
# FROM node:14
211
FROM node:12.18.3-alpine3.9
222

233
WORKDIR /app/

0 commit comments

Comments
 (0)