Skip to content
Merged
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
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.idea/
# comment this if seeding data
src/main/resources/data.sql
3 changes: 2 additions & 1 deletion compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ services:
- db-data:/var/lib/postgresql/data

backend:
image: pecacm/acm-website:1.1.12
# image: pecacm/acm-backend:local # build your own image if you want to seed data
image : pecacm/acm-website:1.1.12
container_name: acm-backend
environment:
- POSTGRESQL_DB_URL=jdbc:postgresql://postgres-database:5432/acm
Expand Down
8 changes: 8 additions & 0 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,20 @@ spring:
jpa:
hibernate:
ddl-auto: update
# defer-datasource-initialization: true # use this if seeding data
properties:
hibernate:
format_sql: true
show-sql: true
use_sql_comments: true
database-platform: org.hibernate.dialect.PostgreSQLDialect

#use when seeding data

# sql:
# init:
# mode: always

mail:
host: smtp.gmail.com
port: 587
Expand All @@ -56,6 +63,7 @@ spring:
starttls:
enable: true
required: true

jwt:
secret: nyanpasu
verify:
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/data.sql
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ VALUES (2, 2024, 'CSE', 'Member', NULL, '[email protected]',
INSERT INTO public.users (id, batch, branch, designation, display_picture, email, name, password, student_id, verified,
xp_total)
VALUES (1, 2024, 'CSE', 'Admin', NULL, '[email protected]', 'Harshpreet Singh Johar',
'$2a$10$d/mEUVISoHIQumX3MZE2iuWbhtqIlCuW5xIEw9vxEuIbWx/TMfcWO', 20103076, 't', 10);
'$2a$10$RJzQiTkb/ZbBDwSYXTYTYeo7gKBDn7Q0ntqLBW5nCIYZZd8/NkuFu', 20103076, 't', 10);

--
-- Data for Name: transactions; Type: TABLE DATA; Schema: public; Owner: acmsecy
Expand Down
Binary file modified target/backend-1.0.1.jar
Binary file not shown.
Binary file modified target/backend-1.0.1.jar.original
Binary file not shown.
8 changes: 8 additions & 0 deletions target/classes/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,20 @@ spring:
jpa:
hibernate:
ddl-auto: update
# defer-datasource-initialization: true # use this if seeding data
properties:
hibernate:
format_sql: true
show-sql: true
use_sql_comments: true
database-platform: org.hibernate.dialect.PostgreSQLDialect

#use when seeding data

# sql:
# init:
# mode: always

mail:
host: smtp.gmail.com
port: 587
Expand All @@ -56,6 +63,7 @@ spring:
starttls:
enable: true
required: true

jwt:
secret: nyanpasu
verify:
Expand Down
2 changes: 1 addition & 1 deletion target/classes/data.sql
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ VALUES (2, 2024, 'CSE', 'Member', NULL, '[email protected]',
INSERT INTO public.users (id, batch, branch, designation, display_picture, email, name, password, student_id, verified,
xp_total)
VALUES (1, 2024, 'CSE', 'Admin', NULL, '[email protected]', 'Harshpreet Singh Johar',
'$2a$10$d/mEUVISoHIQumX3MZE2iuWbhtqIlCuW5xIEw9vxEuIbWx/TMfcWO', 20103076, 't', 10);
'$2a$10$RJzQiTkb/ZbBDwSYXTYTYeo7gKBDn7Q0ntqLBW5nCIYZZd8/NkuFu', 20103076, 't', 10);

--
-- Data for Name: transactions; Type: TABLE DATA; Schema: public; Owner: acmsecy
Expand Down