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.

Sign up for GitHub

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

Jump to bottom

Project (almost) finished #7

Merged
merged 24 commits into from
Jun 22, 2024
Merged

Project (almost) finished #7

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a5a436b
initial commit
vivoit00 Apr 29, 2024
b23f14a
django backend setup
vivoit00 Apr 29, 2024
9e949a3
some changes to new backend
vivoit00 Apr 29, 2024
abd34a4
Merge branch 'develop' into new_backend
noellrr Apr 29, 2024
51cff21
Merge pull request #1 from vivoit00/new_backend
vivoit00 Apr 29, 2024
aa79666
Remove unused code
noellrr Apr 29, 2024
49ef4c2
Merge pull request #2 from vivoit00/docker-compose-cleanup
vivoit00 Apr 29, 2024
7394eb8
Implement basics for database connection
noellrr Apr 29, 2024
78a7413
Add requirements.txt
noellrr May 12, 2024
b9abf5f
Make Database connection work
noellrr May 26, 2024
106d04c
Merge pull request #4 from vivoit00/database_connection
vivoit00 May 27, 2024
ed3271c
Use hot reloading for django
noellrr Jun 8, 2024
2457447
GET and POST almost work
noellrr Jun 12, 2024
12fce7d
cmd commands in dockerfile
vivoit00 Jun 16, 2024
d373843
changed form json to normal format
vivoit00 Jun 16, 2024
9ecc91f
delete fixed
vivoit00 Jun 16, 2024
6d10c36
frontend GET works
vivoit00 Jun 16, 2024
72497fd
POST in frontend works
noellrr Jun 16, 2024
6b243fd
API works with frontend
noellrr Jun 16, 2024
ff43f81
Merge pull request #5 from vivoit00/implement-api-basics
vivoit00 Jun 16, 2024
ab750a9
pushed to docker hub
vivoit00 Jun 16, 2024
30ffbbe
Merge pull request #6 from vivoit00/docker-image
noellrr Jun 16, 2024
d0572e2
Add README.md
noellrr Jun 17, 2024
3a32937
Update README
noellrr Jun 17, 2024
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
Prev Previous commit
Next Next commit
pushed to docker hub
  • Loading branch information
@vivoit00
vivoit00 committed Jun 16, 2024
commit ab750a93cd68b2900b157427ac9ec8fab2d16c2b
18 changes: 1 addition & 17 deletions sample/otel-in-action/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ services:
- POSTGRES_DB=mydb

todobackend-django:
build:
context: ./todobackend_django
dockerfile: Dockerfile
image: vivoit0000/todo_backend
networks:
- todonet
ports:
Expand Down Expand Up @@ -47,20 +45,6 @@ services:
- OTEL_METRICS_EXPORTER=otlp,logging-otlp
- OTEL_LOGS_EXPORTER=none

todoui-flask:
image: maeddes/todoui-flask:v2404
build:
context: ./todoui-flask
networks:
- todonet
ports:
- "5001:5000"
environment:
- BACKEND_URL=http:https://todobackend-django:8080/
- OTEL_EXPORTER_OTLP_ENDPOINT=otelcol:4317
- OTEL_RESOURCE_ATTRIBUTES=service.name=todoui-flask
- OTEL_METRICS_EXPORTER=otlp

loadgenerator:
image: generator:v0.1
build:
Expand Down