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

MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin #301

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open

MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin #301

Changes from 12 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d77ea7c
MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin
khandramai Mar 17, 2023
866077c
MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin
khandramai Mar 17, 2023
598db20
MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin
khandramai Mar 17, 2023
73350da
MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin
khandramai Mar 17, 2023
634b71d
Merge remote-tracking branch 'origin/MODOAIPMH-433-docker-approach' i…
khandramai Mar 17, 2023
0ac2a2f
MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin
khandramai Mar 17, 2023
8f83566
MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin
khandramai Mar 17, 2023
7ee68ed
MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin
khandramai Mar 17, 2023
bf1596a
MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin
khandramai Mar 17, 2023
ece1264
MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin
khandramai Mar 17, 2023
351f32e
MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin
khandramai Mar 17, 2023
4d1bb1e
MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin
khandramai Mar 23, 2023
e4800cf
Merge branch 'master' into MODOAIPMH-433-docker-approach
khandramai Mar 27, 2023
6a6c1b0
MODOAIPMH-433
khandramai Mar 27, 2023
5b5967f
MODOAIPMH-433
khandramai Mar 27, 2023
dc66670
MODOAIPMH-433
khandramai Mar 27, 2023
dc5bfe5
MODOAIPMH-433
khandramai Mar 27, 2023
fa014f2
postgres
siarhei-charniak Mar 29, 2023
83ea959
MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin
khandramai Mar 30, 2023
da227e5
Merge branch 'master' into MODOAIPMH-433-docker-approach
khandramai Mar 30, 2023
38cf0af
MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin
khandramai Mar 30, 2023
0ad67a6
Merge remote-tracking branch 'origin/MODOAIPMH-433-docker-approach' i…
khandramai Mar 30, 2023
ddb1df4
MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin
khandramai Mar 30, 2023
db4c2bb
MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin
khandramai Mar 30, 2023
e534f69
MODOAIPMH-433 - embedded-postgresql-maven-plugin -> docker-maven-plugin
khandramai Mar 30, 2023
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
34 changes: 23 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,14 @@
<netty.version>4.1.78.Final</netty.version>
<mockserver-client-java.version>5.11.2</mockserver-client-java.version>
<generate-marc-utils-version>1.5.0</generate-marc-utils-version>
<postgres.docker.env.POSTGRES_DB>localhost</postgres.docker.env.POSTGRES_DB>
<postgres.docker.envRun.POSTGRES_PASSWORD>postgres</postgres.docker.envRun.POSTGRES_PASSWORD>
<postgres.docker.envRun.POSTGRES_USER>postgres</postgres.docker.envRun.POSTGRES_USER>
Comment on lines +163 to +165
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see any usage of these variables. Can they be removed?

<postgres.docker.log.prefix>postgres</postgres.docker.log.prefix>
<postgres.docker.name>postgres:12.0</postgres.docker.name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can .0 be removed so that the latest version 12 release is used?

We don't want vulnerable components in the build.

<postgres.docker.ports.1>15432:5432</postgres.docker.ports.1>
<postgres.docker.wait.log>PostgreSQL init process complete</postgres.docker.wait.log>
<postgres.docker.wait.time>60000</postgres.docker.wait.time>
</properties>

<dependencies>
Expand Down Expand Up @@ -720,25 +728,29 @@
</plugin>

<plugin>
<groupId>com.gitlab.janecekpetr</groupId>
<artifactId>embedded-postgresql-maven-plugin</artifactId>
<version>0.1.0</version>
<configuration>
<pgServerPort>15432</pgServerPort>
<dbName>postgres</dbName>
<userName>postgres</userName>
<password>postgres</password>
</configuration>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.22.1</version>
julianladisch marked this conversation as resolved.
Show resolved Hide resolved
<executions>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before starting the database you need to clean up a left-over database from a previous run where a maven phase after prepare-database but before stop-database has failed:

          <execution>
            <id>stop-previous-database</id>
            <phase>generate-sources</phase>
            <goals>
              <goal>stop</goal>
            </goals>
          </execution>

<execution>
<id>start-pgsql</id>
<id>prepare-database</id>
<phase>initialize</phase>
julianladisch marked this conversation as resolved.
Show resolved Hide resolved
<goals>
<goal>start</goal>
</goals>
<configuration>
julianladisch marked this conversation as resolved.
Show resolved Hide resolved
<images>
<image>
<external>
<type>properties</type>
<prefix>postgres.docker</prefix>
</external>
</image>
</images>
</configuration>
julianladisch marked this conversation as resolved.
Show resolved Hide resolved
</execution>
<execution>
<id>stop-pgsql</id>
<id>stop-database</id>
<phase>compile</phase>
julianladisch marked this conversation as resolved.
Show resolved Hide resolved
<goals>
<goal>stop</goal>
Expand Down