From 8c4fa37b1985fd5f4c4e0e4d8ea42a01cb28dd36 Mon Sep 17 00:00:00 2001 From: Kar Rui Lau Date: Thu, 3 Mar 2022 11:17:20 +0800 Subject: [PATCH 1/2] fix: revert replSet in local docker-compose since we've rolled back to v5, this is unneeded and causes fresh builds to fail First introduced in #3039 --- docker-compose.yml | 9 +- mongo-seed/init.json => init-mongo.js | 8 +- mongo-seed/Dockerfile | 8 -- mongo-seed/init-mongo.sh | 8 -- mongo-seed/wait-for-it.sh | 182 -------------------------- 5 files changed, 6 insertions(+), 209 deletions(-) rename mongo-seed/init.json => init-mongo.js (76%) delete mode 100644 mongo-seed/Dockerfile delete mode 100644 mongo-seed/init-mongo.sh delete mode 100644 mongo-seed/wait-for-it.sh diff --git a/docker-compose.yml b/docker-compose.yml index 32f080d5ee..489fd16183 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -113,19 +113,12 @@ services: - MONGO_INITDB_DATABASE=formsg volumes: - mongodata:/data/db - command: --bind_ip_all --replSet rs0 + - ./init-mongo.js:/docker-entrypoint-initdb.d/init-mongo.js:ro ports: - '27017:27017' logging: driver: none - mongo-seed: - build: ./mongo-seed - depends_on: - - database - links: - - database - localstack: image: localstack/localstack:0.11.5 container_name: formsg-localstack diff --git a/mongo-seed/init.json b/init-mongo.js similarity index 76% rename from mongo-seed/init.json rename to init-mongo.js index 1d60eb1fec..666e80c5ec 100644 --- a/mongo-seed/init.json +++ b/init-mongo.js @@ -1,4 +1,6 @@ -[{ +/* eslint-disable */ +db.createCollection("agencies") +db.agencies.insert([{ "shortName" : "govtech", "fullName" : "Government Technology Agency", "logo" : "https://s3-ap-southeast-1.amazonaws.com/agency-logo.form.sg/govtech.jpg", @@ -7,5 +9,5 @@ "data.gov.sg", "form.sg", "open.gov.sg" - ] -}] \ No newline at end of file + ], +}]) \ No newline at end of file diff --git a/mongo-seed/Dockerfile b/mongo-seed/Dockerfile deleted file mode 100644 index 2ff3aa8585..0000000000 --- a/mongo-seed/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM mongo:4.0 - -COPY init.json /init.json -COPY wait-for-it.sh /. -COPY init-mongo.sh /. -RUN chmod +x /wait-for-it.sh -RUN chmod +x /init-mongo.sh -CMD [ "bash", "-c", "/wait-for-it.sh database:27017 -- /init-mongo.sh"] \ No newline at end of file diff --git a/mongo-seed/init-mongo.sh b/mongo-seed/init-mongo.sh deleted file mode 100644 index 9ec65cf275..0000000000 --- a/mongo-seed/init-mongo.sh +++ /dev/null @@ -1,8 +0,0 @@ -if [ ! -f /data/mongo-init.flag ]; then - echo "Init replicaset" - mongo database:27017 --eval "rs.initiate()" - mongoimport --host database:27017 --db formsg --collection agencies --type json --file init.json --jsonArray - touch /data/mongo-init.flag -else - echo "Replicaset already initialized" -fi \ No newline at end of file diff --git a/mongo-seed/wait-for-it.sh b/mongo-seed/wait-for-it.sh deleted file mode 100644 index 3974640b05..0000000000 --- a/mongo-seed/wait-for-it.sh +++ /dev/null @@ -1,182 +0,0 @@ -#!/usr/bin/env bash -# Use this script to test if a given TCP host/port are available - -WAITFORIT_cmdname=${0##*/} - -echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi } - -usage() -{ - cat << USAGE >&2 -Usage: - $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args] - -h HOST | --host=HOST Host or IP under test - -p PORT | --port=PORT TCP port under test - Alternatively, you specify the host and port as host:port - -s | --strict Only execute subcommand if the test succeeds - -q | --quiet Don't output any status messages - -t TIMEOUT | --timeout=TIMEOUT - Timeout in seconds, zero for no timeout - -- COMMAND ARGS Execute command with args after the test finishes -USAGE - exit 1 -} - -wait_for() -{ - if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then - echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" - else - echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout" - fi - WAITFORIT_start_ts=$(date +%s) - while : - do - if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then - nc -z $WAITFORIT_HOST $WAITFORIT_PORT - WAITFORIT_result=$? - else - (echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1 - WAITFORIT_result=$? - fi - if [[ $WAITFORIT_result -eq 0 ]]; then - WAITFORIT_end_ts=$(date +%s) - echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds" - break - fi - sleep 1 - done - return $WAITFORIT_result -} - -wait_for_wrapper() -{ - # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692 - if [[ $WAITFORIT_QUIET -eq 1 ]]; then - timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & - else - timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & - fi - WAITFORIT_PID=$! - trap "kill -INT -$WAITFORIT_PID" INT - wait $WAITFORIT_PID - WAITFORIT_RESULT=$? - if [[ $WAITFORIT_RESULT -ne 0 ]]; then - echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" - fi - return $WAITFORIT_RESULT -} - -# process arguments -while [[ $# -gt 0 ]] -do - case "$1" in - *:* ) - WAITFORIT_hostport=(${1//:/ }) - WAITFORIT_HOST=${WAITFORIT_hostport[0]} - WAITFORIT_PORT=${WAITFORIT_hostport[1]} - shift 1 - ;; - --child) - WAITFORIT_CHILD=1 - shift 1 - ;; - -q | --quiet) - WAITFORIT_QUIET=1 - shift 1 - ;; - -s | --strict) - WAITFORIT_STRICT=1 - shift 1 - ;; - -h) - WAITFORIT_HOST="$2" - if [[ $WAITFORIT_HOST == "" ]]; then break; fi - shift 2 - ;; - --host=*) - WAITFORIT_HOST="${1#*=}" - shift 1 - ;; - -p) - WAITFORIT_PORT="$2" - if [[ $WAITFORIT_PORT == "" ]]; then break; fi - shift 2 - ;; - --port=*) - WAITFORIT_PORT="${1#*=}" - shift 1 - ;; - -t) - WAITFORIT_TIMEOUT="$2" - if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi - shift 2 - ;; - --timeout=*) - WAITFORIT_TIMEOUT="${1#*=}" - shift 1 - ;; - --) - shift - WAITFORIT_CLI=("$@") - break - ;; - --help) - usage - ;; - *) - echoerr "Unknown argument: $1" - usage - ;; - esac -done - -if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then - echoerr "Error: you need to provide a host and port to test." - usage -fi - -WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15} -WAITFORIT_STRICT=${WAITFORIT_STRICT:-0} -WAITFORIT_CHILD=${WAITFORIT_CHILD:-0} -WAITFORIT_QUIET=${WAITFORIT_QUIET:-0} - -# Check to see if timeout is from busybox? -WAITFORIT_TIMEOUT_PATH=$(type -p timeout) -WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH) - -WAITFORIT_BUSYTIMEFLAG="" -if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then - WAITFORIT_ISBUSY=1 - # Check if busybox timeout uses -t flag - # (recent Alpine versions don't support -t anymore) - if timeout &>/dev/stdout | grep -q -e '-t '; then - WAITFORIT_BUSYTIMEFLAG="-t" - fi -else - WAITFORIT_ISBUSY=0 -fi - -if [[ $WAITFORIT_CHILD -gt 0 ]]; then - wait_for - WAITFORIT_RESULT=$? - exit $WAITFORIT_RESULT -else - if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then - wait_for_wrapper - WAITFORIT_RESULT=$? - else - wait_for - WAITFORIT_RESULT=$? - fi -fi - -if [[ $WAITFORIT_CLI != "" ]]; then - if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then - echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess" - exit $WAITFORIT_RESULT - fi - exec "${WAITFORIT_CLI[@]}" -else - exit $WAITFORIT_RESULT -fi \ No newline at end of file From 536071becfe1714f905d1e88f6f52d844b490f74 Mon Sep 17 00:00:00 2001 From: Kar Rui Lau Date: Thu, 3 Mar 2022 11:17:54 +0800 Subject: [PATCH 2/2] chore(docker-compose): update mongo image from 4.0 to 4.2 keep consistent with the database version we are using in prod --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 489fd16183..22b426383c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -107,7 +107,7 @@ services: network_mode: 'service:formsg' # reuse formsg service's network stack so that it can resolve localhost:5156 to mockpass:5156 database: - image: 'mongo:4.0' + image: 'mongo:4.2' container_name: 'formsg-db' environment: - MONGO_INITDB_DATABASE=formsg