Skip to content
Permalink
Browse files

Fix "database is destroyed on down/up cycle"

However, it requires PR #7 from docker/mariadb repo to be accepted
in order to function.
  • Loading branch information
mederly committed Sep 26, 2018
1 parent 95d4fab commit 2c7854a9e2ac2095e54f2d822a7b19b11a558857
Showing with 14 additions and 17 deletions.
  1. +5 −8 midpoint/docker-compose.yml
  2. +2 −2 midpoint/midpoint-server/Dockerfile
  3. +7 −7 midpoint/test.sh
@@ -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" version: "3.3"


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


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


volumes: volumes:
midpoint_mysql:
midpoint_data: midpoint_data:
midpoint_home: midpoint_home:
@@ -86,8 +86,8 @@ ENV LOGOUT_URL https://localhost:8443/Shibboleth.sso/Logout


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


# TIER Beacon Opt-out # TIER Beacon Opt-out
# Completely uncomment the following ENV line to prevent the containers from sending analytics information to Internet2. # Completely uncomment the following ENV line to prevent the containers from sending analytics information to Internet2.
@@ -35,12 +35,12 @@ test/t120-add-get-user.sh
ok "OK" ok "OK"
echo echo


heading "Test 200: Stop/start cycle..." #heading "Test 200: Stop/start cycle..."
test/t200-stop-start.sh #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" #ok "OK"
#echo #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.
You can’t perform that action at this time.