diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000000000000000000000000000000000000..2f48889d803edc4f1d12617a7667d21312def625 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,13 @@ +services: + myaktion: + build: ./src/myaktion + ports: + - "8000:8000" + environment: + - DB_CONNECT=mariadb:3306 + - LOG_LEVEL=info + mariadb: + image: mariadb:10.5 + environment: + - MYSQL_ROOT_PASSWORD=root + - MYSQL_DATABASE=myaktion \ No newline at end of file diff --git a/scripts/start-mariadb.sh b/scripts/start-mariadb.sh deleted file mode 100644 index 04ad7c12bc65846ebed508eadaedf817ae9226ab..0000000000000000000000000000000000000000 --- a/scripts/start-mariadb.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -docker run -d -p 3306:3306 --name database -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=myaktion mariadb:10.5 \ No newline at end of file diff --git a/scripts/stop-mariadb.sh b/scripts/stop-mariadb.sh deleted file mode 100644 index da085ee5c924515aa600dec763a0b0e1b2d3341c..0000000000000000000000000000000000000000 --- a/scripts/stop-mariadb.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -docker kill database && docker rm database \ No newline at end of file diff --git a/src/myaktion/Dockerfile b/src/myaktion/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..72ddf9888870a334f5980426968fe339f285e59f --- /dev/null +++ b/src/myaktion/Dockerfile @@ -0,0 +1,10 @@ +FROM golang:1.20-buster +WORKDIR /go/src/app +COPY . . +RUN ls -l +RUN go mod download +RUN go install +RUN chmod +x ./wait-for-it.sh ./docker-entrypoint.sh +ENTRYPOINT ["./docker-entrypoint.sh"] +CMD ["myaktion"] +EXPOSE 8000 \ No newline at end of file diff --git a/src/myaktion/docker-entrypoint.sh b/src/myaktion/docker-entrypoint.sh new file mode 100644 index 0000000000000000000000000000000000000000..e154eef6f901de1fdfecf54a2fd7c22ae08b8988 --- /dev/null +++ b/src/myaktion/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e +# Wait for DB +if [ -n "$DB_CONNECT" ]; then + /go/src/app/wait-for-it.sh "$DB_CONNECT" -t 20 +fi +# Run the main container command. +exec "$@" \ No newline at end of file diff --git a/go.mod b/src/myaktion/go.mod similarity index 83% rename from go.mod rename to src/myaktion/go.mod index 599112837d6333e1c49ae70b91f66b385ffeec7a..f4e5cb0df0da3b6a2ce5fe306eb7ecd9f9d19044 100644 --- a/go.mod +++ b/src/myaktion/go.mod @@ -1,4 +1,4 @@ -module gitlab.reutlingen-university.de/albrecht/myaktion-go +module gitlab.reutlingen-university.de/albrecht/myaktion-go/src/myaktion go 1.20 diff --git a/go.sum b/src/myaktion/go.sum similarity index 100% rename from go.sum rename to src/myaktion/go.sum diff --git a/main/main.go b/src/myaktion/main.go similarity index 100% rename from main/main.go rename to src/myaktion/main.go diff --git a/src/myaktion/model/campaign.go b/src/myaktion/model/campaign.go index e90118da47b8c3dd5a8d32a4b2a54365e2a0f525..7ddacc0528e872df7b635ad0663a804756bb51a4 100644 --- a/src/myaktion/model/campaign.go +++ b/src/myaktion/model/campaign.go @@ -12,3 +12,5 @@ type Campaign struct { AmountDonatedSoFar float64 `gorm:"-"` Account Account `gorm:"embedded;embeddedPrefix:account_"` } + +//func (c *Campaign) AfterFind(tx *gorm.DB) diff --git a/src/myaktion/wait-for-it.sh b/src/myaktion/wait-for-it.sh new file mode 100644 index 0000000000000000000000000000000000000000..3974640b053e6f84a21c292c01e3674348445831 --- /dev/null +++ b/src/myaktion/wait-for-it.sh @@ -0,0 +1,182 @@ +#!/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