Skip to content

Commit

Permalink
Fix "database is destroyed on down/up cycle"
Browse files Browse the repository at this point in the history
However, it requires PR docker#7 from docker/mariadb repo to be accepted
in order to function.
  • Loading branch information
mederly committed Sep 26, 2018
1 parent 95d4fab commit 2c7854a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 17 deletions.
13 changes: 5 additions & 8 deletions midpoint/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
#
# Building:
# - docker-compose up --build
#
# It assumes that midpoint-3.9-SNAPSHOT-dist.tar.gz is present in the 'midpoint-server' directory. (TODO: eliminate this!)
#

version: "3.3"

services:
Expand All @@ -15,7 +8,10 @@ services:
networks:
- back
volumes:
- midpoint_data:/var/lib/mysql
- midpoint_mysql:/var/lib/mysql
- midpoint_data:/var/lib/mysqlmounted
environment:
- CREATE_NEW_DATABASE=if_needed

midpoint-server:
build: ./midpoint-server/
Expand Down Expand Up @@ -77,5 +73,6 @@ secrets:
file: ./configs-and-secrets/midpoint/application/keystore_password.txt

volumes:
midpoint_mysql:
midpoint_data:
midpoint_home:
4 changes: 2 additions & 2 deletions midpoint/midpoint-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ ENV LOGOUT_URL https://localhost:8443/Shibboleth.sso/Logout

ENV KEYSTORE_PASSWORD_FILE /run/secrets/m_keystore_password.txt
ENV MEM 2048m
ENV TIER_RELEASE=not-released-yet
ENV TIER_MAINTAINER=tier
ENV TIER_RELEASE not-released-yet
ENV TIER_MAINTAINER tier

# TIER Beacon Opt-out
# Completely uncomment the following ENV line to prevent the containers from sending analytics information to Internet2.
Expand Down
14 changes: 7 additions & 7 deletions midpoint/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ test/t120-add-get-user.sh
ok "OK"
echo

heading "Test 200: Stop/start cycle..."
test/t200-stop-start.sh
ok "OK"
echo

#heading "Test 300: Checking repository preservation across compose down/up..."
#test/t300-repository-preservation.sh
#heading "Test 200: Stop/start cycle..."
#test/t200-stop-start.sh
#ok "OK"
#echo

heading "Test 300: Checking repository preservation across compose down/up..."
test/t300-repository-preservation.sh
ok "OK"
echo

0 comments on commit 2c7854a

Please sign in to comment.