Compare commits

..

No commits in common. "39abd1c0d145772bfb98d0bc2b0f4ba01adf5c72" and "fdfb9539dcabd4fb2d6e45be49d466d885e3e230" have entirely different histories.

3 changed files with 9 additions and 38 deletions

View file

@ -82,8 +82,8 @@ services:
# mongo 5 requires avx support so if the machine is not capable of avx support use mongo4 # mongo 5 requires avx support so if the machine is not capable of avx support use mongo4
# NOTE: mongo 4 shell uses mongo and mongo 5 uses mongosh! # NOTE: mongo 4 shell uses mongo and mongo 5 uses mongosh!
# These need to be changed accordingly in the health check and the mongosetup.sh file for the container mongo-init # These need to be changed accordingly in the health check and the mongosetup.sh file for the container mongo-init
image: mongo:5
#image: mongo:4 #image: mongo:4
image: mongo:4
restart: always restart: always
environment: environment:
- MONGO_INITDB_ROOT_USERNAME=${USER} - MONGO_INITDB_ROOT_USERNAME=${USER}
@ -106,9 +106,9 @@ services:
- ./portfolio/mongo/db_backups:/db_backups - ./portfolio/mongo/db_backups:/db_backups
healthcheck: healthcheck:
# mongo 5 # mongo 5
test: echo 'rs.status().ok' | mongosh --host mongo:27017 -u $${MONGO_INITDB_ROOT_USERNAME} -p $${MONGO_INITDB_ROOT_PASSWORD} --quiet | grep 1 #test: echo 'rs.status().ok' | mongosh --host mongo:27017 -u $${MONGO_INITDB_ROOT_USERNAME} -p $${MONGO_INITDB_ROOT_PASSWORD} --quiet | grep 1
# mongo 4 # mongo 4
#test: echo 'rs.status().ok' | mongo --host mongo:27017 -u $${MONGO_INITDB_ROOT_USERNAME} -p $${MONGO_INITDB_ROOT_PASSWORD} --quiet | grep 1 test: echo 'rs.status().ok' | mongo --host mongo:27017 -u $${MONGO_INITDB_ROOT_USERNAME} -p $${MONGO_INITDB_ROOT_PASSWORD} --quiet | grep 1
interval: 15s interval: 15s
start_period: 20s start_period: 20s
@ -118,17 +118,11 @@ services:
image: mongo:5 image: mongo:5
restart: on-failure restart: on-failure
volumes: volumes:
# mongo 5 - ./portfolio/mongo/scripts/mongosetup.sh:/scripts/mongosetup.sh
- ./portfolio/mongo/scripts/mongo5setup.sh:/scripts/mongo5setup.sh
# mongo 4
#- ./portfolio/mongo/scripts/mongo4setup.sh:/scripts/mongo4setup.sh
# these two are necessary otherwise they get created again as anonymous volumes # these two are necessary otherwise they get created again as anonymous volumes
- ./portfolio/mongo/data/db:/data/db - ./portfolio/mongo/data/db:/data/db
- ./portfolio/mongo/data/configdb:/data/configdb - ./portfolio/mongo/data/configdb:/data/configdb
# mongo 5 entrypoint: ["bash", "/scripts/mongosetup.sh" ]
entrypoint: ["bash", "/scripts/mongo5setup.sh" ]
# mongo 4
#entrypoint: ["bash", "/scripts/mongo4setup.sh" ]
environment: environment:
- MONGO_INITDB_ROOT_USERNAME=${USER} - MONGO_INITDB_ROOT_USERNAME=${USER}
- MONGO_INITDB_ROOT_PASSWORD=${PASSWORD} - MONGO_INITDB_ROOT_PASSWORD=${PASSWORD}
@ -164,7 +158,6 @@ services:
restheart: restheart:
image: softinstigate/restheart:7 image: softinstigate/restheart:7
container_name: restheart container_name: restheart
# NOTE: the api_admin endpoint only works locally
environment: environment:
- RHO= - RHO=
/mongo/mongo-mounts[1]->{'where':'/api','what':'portfolio'}; /mongo/mongo-mounts[1]->{'where':'/api','what':'portfolio'};

View file

@ -1,26 +0,0 @@
echo "**********************************************"
echo "Waiting for startup.."
sleep 15
echo "done"
echo SETUP.sh time now: `date +"%T" `
mongo --host mongo:27017 -u ${MONGO_INITDB_ROOT_USERNAME} -p ${MONGO_INITDB_ROOT_PASSWORD} <<EOF
var cfg = {
"_id": "rs0",
"protocolVersion": 1,
"version": 1,
"members": [
{
"_id": 0,
"host": "mongo:27017",
"priority": 2
}
]
};
rs.initiate(cfg, { force: true });
rs.secondaryOk();
db.getMongo().setReadPref('primary');
rs.status();
EOF

View file

@ -5,6 +5,10 @@ echo "done"
echo SETUP.sh time now: `date +"%T" ` echo SETUP.sh time now: `date +"%T" `
# mongo 5
#mongosh --host mongo:27017 -u ${MONGO_INITDB_ROOT_USERNAME} -p ${MONGO_INITDB_ROOT_PASSWORD} <<EOF
# mongo 4
mongosh --host mongo:27017 -u ${MONGO_INITDB_ROOT_USERNAME} -p ${MONGO_INITDB_ROOT_PASSWORD} <<EOF mongosh --host mongo:27017 -u ${MONGO_INITDB_ROOT_USERNAME} -p ${MONGO_INITDB_ROOT_PASSWORD} <<EOF
var cfg = { var cfg = {