Skip to content

Commit d5fe433

Browse files
committed
Updates for the debug container and migrations for database
1 parent 8193b14 commit d5fe433

File tree

5 files changed

+132
-22
lines changed

5 files changed

+132
-22
lines changed

.devcontainer/Dockerfile.debug

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,43 @@
1-
# .devcontainer/Dockerfile.debug
2-
FROM ubuntu:22.04
1+
# Use Debian slim as the base image
2+
FROM debian:bookworm-slim
33

44
# Install necessary packages
55
RUN apt-get update && \
6-
apt-get install -y \
6+
apt-get install -y --no-install-recommends \
77
curl \
8-
docker-compose \
98
gnupg \
109
lsb-release \
1110
wget \
1211
software-properties-common \
13-
x11-apps \
14-
x11-utils \
15-
x11-xserver-utils \
16-
dbus-x11 \
1712
xvfb \
18-
openjdk-11-jre && \
19-
# Add DBeaver repository and install DBeaver
20-
wget -O - https://dbeaver.io/debs/dbeaver.gpg.key | apt-key add - && \
21-
echo "deb https://dbeaver.io/debs/dbeaver-ce /" | tee /etc/apt/sources.list.d/dbeaver.list && \
22-
apt-get update && \
23-
apt-get install -y dbeaver-ce && \
13+
redis-tools \
14+
python3 \
15+
python3-pip \
16+
python3-venv \
17+
firefox-esr && \
2418
# Install Docker CLI
2519
curl -fsSL https://get.docker.com -o get-docker.sh && \
2620
sh get-docker.sh && \
2721
curl -LO https://download.docker.com/linux/static/stable/x86_64/docker-20.10.8.tgz && \
2822
tar xzvf docker-20.10.8.tgz && \
2923
mv docker/* /usr/local/bin/ && \
3024
chmod +x /usr/local/bin/docker* && \
31-
# Install x11docker
32-
wget https://raw.githubusercontent.com/mviereck/x11docker/master/x11docker && \
33-
chmod +x x11docker && \
34-
mv x11docker /usr/local/bin/ && \
3525
# Clean up
3626
rm -rf docker-20.10.8.tgz docker get-docker.sh && \
27+
apt-get purge -y --auto-remove curl gnupg lsb-release wget && \
3728
apt-get clean && \
3829
rm -rf /var/lib/apt/lists/*
3930

40-
# Default command to keep the container running
41-
CMD ["sleep", "infinity"]
31+
# Create a virtual environment for pgAdmin4 and install it via pip
32+
RUN python3 -m venv /venv && \
33+
/venv/bin/pip install --no-cache-dir pgadmin4
4234

35+
# Set environment variables for pgAdmin4
36+
ENV PGADMIN_DEFAULT_EMAIL=admin@example.com
37+
ENV PGADMIN_DEFAULT_PASSWORD=admin
38+
39+
# Expose pgAdmin port
40+
EXPOSE 80
41+
42+
# Default command to start pgAdmin4
43+
CMD ["python3", "/venv/bin/pgadmin4"]
Binary file not shown.

backend/core/core/settings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@
104104
'NAME': 'udemyp1',
105105
'USER': 'postgres',
106106
'PASSWORD': 'true3',
107-
'HOST': '0.0.0.0',
108-
'PORT': '5433'}
107+
'HOST': '172.22.0.3',
108+
'PORT': '5432'}
109109
}
110110

111111

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
# Generated by Django 5.0.7 on 2024-08-13 05:23
2+
3+
import django.contrib.gis.db.models.fields
4+
import django.db.models.deletion
5+
from django.db import migrations, models
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
initial = True
11+
12+
dependencies = []
13+
14+
operations = [
15+
migrations.CreateModel(
16+
name="Category",
17+
fields=[
18+
(
19+
"id",
20+
models.BigAutoField(
21+
auto_created=True,
22+
primary_key=True,
23+
serialize=False,
24+
verbose_name="ID",
25+
),
26+
),
27+
(
28+
"category_name",
29+
models.CharField(
30+
help_text="Specified Name",
31+
max_length=50,
32+
verbose_name="Category Name",
33+
),
34+
),
35+
("created_at", models.DateTimeField(auto_now_add=True)),
36+
("modified_at", models.DateTimeField(auto_now=True)),
37+
],
38+
options={
39+
"verbose_name_plural": "Categories",
40+
},
41+
),
42+
migrations.CreateModel(
43+
name="City",
44+
fields=[
45+
("ogc_fid", models.AutoField(primary_key=True, serialize=False)),
46+
("oldname", models.CharField(max_length=100)),
47+
("name", models.CharField(max_length=100)),
48+
(
49+
"wkb_geometry",
50+
django.contrib.gis.db.models.fields.GeometryField(srid=4326),
51+
),
52+
],
53+
options={
54+
"verbose_name_plural": "Cities",
55+
"db_table": "Cities_India",
56+
},
57+
),
58+
migrations.CreateModel(
59+
name="Contact",
60+
fields=[
61+
("id", models.AutoField(primary_key=True, serialize=False)),
62+
("name", models.CharField(max_length=100)),
63+
("mobile", models.CharField(max_length=15)),
64+
("address", models.CharField(max_length=100)),
65+
(
66+
"gps_location",
67+
django.contrib.gis.db.models.fields.PointField(srid=4326),
68+
),
69+
("email", models.CharField(max_length=100)),
70+
],
71+
),
72+
migrations.CreateModel(
73+
name="Place",
74+
fields=[
75+
(
76+
"id",
77+
models.BigAutoField(
78+
auto_created=True,
79+
primary_key=True,
80+
serialize=False,
81+
verbose_name="ID",
82+
),
83+
),
84+
("place_name", models.CharField(max_length=50)),
85+
("description", models.CharField(blank=True, max_length=254)),
86+
("created_at", models.DateTimeField(auto_now_add=True)),
87+
("modified_at", models.DateTimeField(auto_now=True)),
88+
(
89+
"image",
90+
models.ImageField(blank=True, null=True, upload_to="place_images/"),
91+
),
92+
("active", models.BooleanField(default=True)),
93+
(
94+
"point_geom",
95+
django.contrib.gis.db.models.fields.PointField(srid=4326),
96+
),
97+
(
98+
"categories",
99+
models.ForeignKey(
100+
on_delete=django.db.models.deletion.CASCADE,
101+
to="p1backend.category",
102+
),
103+
),
104+
],
105+
options={
106+
"verbose_name_plural": "Places",
107+
},
108+
),
109+
]
Binary file not shown.

0 commit comments

Comments
 (0)