Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker-compose error corrected... #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"editor.acceptSuggestionOnEnter": "on"
}
8 changes: 4 additions & 4 deletions auth-react/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM node:latest
WORKDIR /code
COPY package*.json /code/
FROM node:16.0.0
WORKDIR /client
COPY package*.json /client/
RUN npm install
COPY . /code/
COPY . /client/
3 changes: 2 additions & 1 deletion auth-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"@testing-library/user-event": "^7.1.2",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-scripts": "3.4.3"
"react-scripts": "3.4.3",
"axios": "^1.1.2"
},
"scripts": {
"start": "react-scripts start",
Expand Down
11 changes: 6 additions & 5 deletions authDjango/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ FROM python:3.8.3

ENV PYTHONUNBUFFERED 1

RUN mkdir /code
WORKDIR /code
COPY requirements.txt /code/
RUN mkdir /api
WORKDIR /api
COPY requirements.txt /api/
RUN pip install -r requirements.txt
RUN python manage.py makemigrations
RUN python manage.py migrate


COPY . /code/
COPY . /api/
Binary file not shown.
Binary file added authDjango/authApp/__pycache__/admin.cpython-310.pyc
Binary file not shown.
Binary file added authDjango/authApp/__pycache__/apps.cpython-310.pyc
Binary file not shown.
Binary file not shown.
Binary file added authDjango/authApp/__pycache__/urls.cpython-310.pyc
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion authDjango/authApp/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@


class AuthConfig(AppConfig):
name = 'auth'
name = 'authApp'
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
10 changes: 2 additions & 8 deletions authDjango/authDjango/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,11 @@

DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql',
'NAME': 'authTesting',
'USER': 'postgres',
'PASSWORD': '...',
# 'HOST': 'localhost',
'HOST': 'host.docker.internal',
'PORT': 5433,
'ENGINE': 'django.db.backends.sqlite3',
'NAME': BASE_DIR / 'db.sqlite3',
}
}


# Password validation
# https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators

Expand Down
Binary file added authDjango/db.sqlite3
Binary file not shown.