diff --git a/.dockerignore b/.dockerignore index 3b5ed26..66db253 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,3 @@ .idea/ +# comment this if seeding data src/main/resources/data.sql \ No newline at end of file diff --git a/compose.yaml b/compose.yaml index f026a38..649511d 100644 --- a/compose.yaml +++ b/compose.yaml @@ -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 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 830a06c..da8634e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -37,6 +37,7 @@ spring: jpa: hibernate: ddl-auto: update +# defer-datasource-initialization: true # use this if seeding data properties: hibernate: format_sql: true @@ -44,6 +45,12 @@ spring: 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 @@ -56,6 +63,7 @@ spring: starttls: enable: true required: true + jwt: secret: nyanpasu verify: diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index fe8a1b0..c67fe95 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -55,7 +55,7 @@ VALUES (2, 2024, 'CSE', 'Member', NULL, 'manjotsinghoberoi.btcse20@pec.edu.in', INSERT INTO public.users (id, batch, branch, designation, display_picture, email, name, password, student_id, verified, xp_total) VALUES (1, 2024, 'CSE', 'Admin', NULL, 'harshpreetsinghjohar.btcse20@pec.edu.in', '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 diff --git a/target/backend-1.0.1.jar b/target/backend-1.0.1.jar index fcf5e75..42e4225 100644 Binary files a/target/backend-1.0.1.jar and b/target/backend-1.0.1.jar differ diff --git a/target/backend-1.0.1.jar.original b/target/backend-1.0.1.jar.original index 0862c02..61bf9fe 100644 Binary files a/target/backend-1.0.1.jar.original and b/target/backend-1.0.1.jar.original differ diff --git a/target/classes/application.yml b/target/classes/application.yml index 830a06c..da8634e 100644 --- a/target/classes/application.yml +++ b/target/classes/application.yml @@ -37,6 +37,7 @@ spring: jpa: hibernate: ddl-auto: update +# defer-datasource-initialization: true # use this if seeding data properties: hibernate: format_sql: true @@ -44,6 +45,12 @@ spring: 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 @@ -56,6 +63,7 @@ spring: starttls: enable: true required: true + jwt: secret: nyanpasu verify: diff --git a/target/classes/data.sql b/target/classes/data.sql index fe8a1b0..c67fe95 100644 --- a/target/classes/data.sql +++ b/target/classes/data.sql @@ -55,7 +55,7 @@ VALUES (2, 2024, 'CSE', 'Member', NULL, 'manjotsinghoberoi.btcse20@pec.edu.in', INSERT INTO public.users (id, batch, branch, designation, display_picture, email, name, password, student_id, verified, xp_total) VALUES (1, 2024, 'CSE', 'Admin', NULL, 'harshpreetsinghjohar.btcse20@pec.edu.in', '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