Skip to content
Snippets Groups Projects
Commit 73e2ebc3 authored by Mirco Nasuti's avatar Mirco Nasuti
Browse files

docker-compose works

parent d4bbeee0
No related branches found
No related tags found
No related merge requests found
......@@ -4,4 +4,6 @@ COPY target/mip.jar /opt/mip/mip.jar
EXPOSE 8080
CMD ["/usr/bin/java", "-jar", "/opt/mip/mip.jar"]
VOLUME /opt/portal/config/
CMD ["/usr/bin/java", "-DconfigFile=/opt/portal/config/portal.properties", -jar", "/opt/mip/mip.jar"]
#!/bin/sh
git submodule update --init
#!/bin/sh
git submodule sync
git submodule update --init
git submodule foreach git pull origin master
portaldb:
image: postgres:9.4.5
ports:
- "55432:5432"
volumes:
- ./src/test/db/sql:/docker-entrypoint-initdb.d/
environment:
POSTGRES_PASSWORD: test
portal-backend:
build: .
volumes:
- ./src/test/docker/:/opt/portal/config/
links:
- portaldb
ports:
- "8080:8080"
#!/bin/bash -e
if groups $USER | grep &>/dev/null '\bdocker\b'; then
DOCKER="docker"
DOCKER_COMPOSE="docker-compose"
else
DOCKER="sudo docker"
DOCKER_COMPOSE="sudo docker-compose"
fi
$DOCKER run -p 8080:8080 -d portal-backend
$DOCKER_COMPOSE up
......@@ -6,9 +6,9 @@
<hibernate-configuration>
<session-factory>
<property name="connection.driver_class">org.postgresql.Driver</property>
<property name="connection.url">jdbc:postgresql://localhost:5432/mirco</property>
<property name="connection.username">mirco</property>
<property name="connection.password">pass</property>
<property name="connection.url">jdbc:postgresql://portaldb:5432/postgres</property>
<property name="connection.username">postgres</property>
<property name="connection.password">test</property>
<property name="hibernate.format_sql">true</property>
<property name="connection.pool_size">1</property>
<property name="hibernate.dialect">org.hibernate.dialect.PostgreSQL82Dialect</property>
......
db @ 94643e89
Subproject commit d1aec18356813ac3da729d8a938299b41e0251ee
Subproject commit 94643e89555c876e5286933f8216f67c9bc559be
# Configuration for the portal running inside a Docker container for development
connection.url="jdbc:postgresql://portaldb:5432/postgres"
connection.username="postgres"
connection.password="test"
security.enabled=false
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment