Stop tracking Portainer secrets

Add action to deploy to ECS after image is built

.dockerignore

@@ -0,0 +1,6 @@
+.git
+.github
+.gitea
+.env
+.idea
+goff

.gitea/workflows/build-and-push.yml

@@ -0,0 +1,135 @@
+name: Build and Push Container
+
+on:
+  push:
+    branches:
+      - master
+      - main
+    tags:
+      - v*
+  workflow_dispatch:
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    env:
+      REGISTRY: gitea.wayfinderak.com
+      IMAGE_NAME: gitea.wayfinderak.com/wayfinderak/goff
+    container:
+      options: --dns 172.16.30.10
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Go and Docker CLI if needed
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          need_apt=0
+          need_apk=0
+          if ! command -v go >/dev/null 2>&1 || ! command -v docker >/dev/null 2>&1; then
+            if command -v apt-get >/dev/null 2>&1; then
+              need_apt=1
+            elif command -v apk >/dev/null 2>&1; then
+              need_apk=1
+            else
+              echo "No supported package manager found" >&2
+              exit 1
+            fi
+          fi
+
+          if [ "$need_apt" -eq 1 ]; then
+            apt-get update
+            if ! command -v go >/dev/null 2>&1; then
+              apt-get install -y golang-go
+            fi
+            if ! command -v docker >/dev/null 2>&1; then
+              apt-get install -y docker.io curl dnsutils iputils-ping
+            fi
+          fi
+
+          if [ "$need_apk" -eq 1 ]; then
+            if ! command -v go >/dev/null 2>&1; then
+              apk add --no-cache go
+            fi
+            if ! command -v docker >/dev/null 2>&1; then
+              apk add --no-cache docker-cli curl bind-tools iputils
+            fi
+          fi
+
+          go version
+          docker version
+
+      - name: Run tests
+        run: go test ./...
+
+      - name: Log in to Gitea Container Registry
+        shell: bash
+        run: |
+          set -euo pipefail
+          for attempt in 1 2 3; do
+            echo "docker login attempt $attempt"
+            if echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login "$REGISTRY" -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin; then
+              exit 0
+            fi
+            sleep 5
+          done
+          echo "docker login failed after 3 attempts" >&2
+          exit 1
+
+      - name: Determine image tags
+        id: meta
+        shell: bash
+        env:
+          REF: ${{ gitea.ref }}
+          REF_NAME: ${{ gitea.ref_name }}
+          SHA: ${{ gitea.sha }}
+        run: |
+          set -euo pipefail
+          tags=()
+
+          if [[ "$REF" == refs/tags/* ]]; then
+            version="$REF_NAME"
+            tags+=("$IMAGE_NAME:$version")
+            tags+=("$IMAGE_NAME:latest")
+          else
+            branch="$REF_NAME"
+            branch_safe="$(echo "$branch" | tr '/_' '--')"
+            sha_short="$(echo "$SHA" | cut -c1-7)"
+            tags+=("$IMAGE_NAME:$branch_safe")
+            tags+=("$IMAGE_NAME:$branch_safe-$sha_short")
+            if [[ "$branch" == "main" || "$branch" == "master" ]]; then
+              tags+=("$IMAGE_NAME:latest")
+            fi
+          fi
+
+          printf 'tags<<EOF\n' >> "$GITHUB_OUTPUT"
+          printf '%s\n' "${tags[@]}" >> "$GITHUB_OUTPUT"
+          printf 'EOF\n' >> "$GITHUB_OUTPUT"
+
+      - name: Build image
+        shell: bash
+        run: |
+          set -euo pipefail
+          mapfile -t tags <<'EOF'
+          ${{ steps.meta.outputs.tags }}
+          EOF
+
+          build_args=()
+          for tag in "${tags[@]}"; do
+            build_args+=(--tag "$tag")
+          done
+
+          docker build "${build_args[@]}" .
+
+      - name: Push image
+        shell: bash
+        run: |
+          set -euo pipefail
+          while IFS= read -r tag; do
+            [ -n "$tag" ] || continue
+            docker push "$tag"
+          done <<'EOF'
+          ${{ steps.meta.outputs.tags }}
+          EOF

.github/workflows/main.yml

@@ -1,64 +1,64 @@
-name: CI
+name: Build and Push Container
 
-# Controls when the action will run. Triggers the workflow on push to master or development 
-# with a tag like v1.0.0 or v1.0.0-dev
 on:
   push:
+    branches:
+      - master
+      - main
     tags:
-      - v[0-9]+.[0-9]+.[0-9]+
-      - v[0-9]+.[0-9]+.[0-9]+-[a-zA-Z]+
+      - v*
+  workflow_dispatch:
+
+env:
+  REGISTRY: gitea.wayfinderak.com
+  IMAGE_NAME: wayfinderak/goff
 
 jobs:
-  build:
+  docker:
     runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v4
 
-      - name: Get Version
-        id: get_version
-        uses: battila7/get-version-action@v2.0.0
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
 
-      - name: install buildx
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Gitea registry
+        uses: docker/login-action@v3
         with:
-          version: latest
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
 
-      - name: Docker Login
-        # You may pin to the exact commit or the version.
-        # uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
-        uses: docker/login-action@v1.10.0
-        with:
-          registry: ${{ secrets.DR_URL }}
-          # Username used to log against the Docker registry
-          username: ${{ secrets.DH_USERNAME }}
-          # Password or personal access token used to log against the Docker registry
-          password: ${{ secrets.DH_PASSWORD }}
-          # Log out from the Docker registry at the end of a job
-          logout: true
-
-      - name: Docker Build & Push
-        env:
-          IMAGE_TAG: ${{ steps.get_version.outputs.version-without-v }}
+      - name: Prepare image tags
+        id: prep
+        shell: bash
         run: |
-          docker buildx build --push \
-          --tag ${{ secrets.DR_URL }}/goff:$IMAGE_TAG \
-          --platform linux/amd64,linux/arm/v7,linux/arm64 . 
+          short_sha="${GITHUB_SHA::7}"
+          tags="${REGISTRY}/${IMAGE_NAME}:sha-${short_sha}"
 
-      - name: Update deployment file
-        run: TAG=${{ steps.get_version.outputs.version-without-v }} && sed -i 's|<IMAGE>|${{ secrets.DR_URL }}/goff:'${TAG}'|' $GITHUB_WORKSPACE/deployment.yml
+          if [[ "${GITHUB_REF_TYPE}" == "branch" && ("${GITHUB_REF_NAME}" == "master" || "${GITHUB_REF_NAME}" == "main") ]]; then
+            tags+=$'\n'"${REGISTRY}/${IMAGE_NAME}:latest"
+          fi
 
-      - uses: azure/k8s-set-context@v1
+          if [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then
+            version="${GITHUB_REF_NAME#v}"
+            tags+=$'\n'"${REGISTRY}/${IMAGE_NAME}:${version}"
+          fi
+
+          {
+            echo 'tags<<EOF'
+            echo "$tags"
+            echo 'EOF'
+          } >> "$GITHUB_OUTPUT"
+
+      - name: Build and push image
+        uses: docker/build-push-action@v6
         with:
-          method: kubeconfig
-          kubeconfig: ${{ secrets.KUBE_CONFIG }}
-        id: setcontext
-
-      - name: Deploy to Kubernetes
-        run: kubectl apply -f $GITHUB_WORKSPACE/deployment.yml
-
-      - name: Verify deployment
-        run: kubectl rollout status deployment/goff
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: ${{ steps.prep.outputs.tags }}

.gitignore

@@ -1,2 +1,4 @@
 .env
 .idea
+
+portainer-app.env

Dockerfile

@@ -1,20 +1,18 @@
-FROM golang:1.14-alpine as dev
+FROM golang:1.22-alpine AS builder
 
-WORKDIR /go/src/Goff
-COPY ./go.mod .
-COPY ./go.sum .
+WORKDIR /src
+RUN apk add --no-cache ca-certificates git tzdata
 
+COPY go.mod go.sum ./
 RUN go mod download
 
 COPY . .
-RUN go install github.com/dustinpianalto/goff/...
+ARG TARGETARCH=amd64
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -o /out/goff ./cmd/goff
 
-CMD [ "go", "run", "cmd/goff/main.go"]
+FROM alpine:3.20
+RUN apk add --no-cache ca-certificates tzdata
 
-from alpine
+COPY --from=builder /out/goff /usr/local/bin/goff
 
-WORKDIR /bin
-
-COPY --from=dev /go/bin/goff ./goff
-
-CMD [ "goff" ]
+ENTRYPOINT ["/usr/local/bin/goff"]

PORTAINER_DEPLOYMENT.md

@@ -0,0 +1,26 @@
+# Portainer deployment notes
+
+Generated from the current Kubernetes deployment in namespace `discord-bots`. Secret values are in the local `portainer-*.env` files.
+
+## Kubernetes source
+
+- Deployment: `goff`
+- Replicas: `1`
+- Rolling update: maxSurge `1`, maxUnavailable `1`
+- minReadySeconds: `120`
+- Labels/selectors: `app=goff`
+- Image pull secrets: `none required for Portainer stack`
+
+## Containers
+
+- `pgbouncer`: image `timoha/pgbouncer:1.15.0`; env: DATABASE_URL, SERVER_TLS_SSLMODE, AUTH_TYPE; ports: 5432; requests: {'cpu': '500m', 'memory': '256Mi'}; limits: {'cpu': '1', 'memory': '512Mi'}
+- `goff`: image `gitea.wayfinderak.com/wayfinderak/goff:latest`; env: DATABASE_URL, DISCORDGO_TOKEN, GOFF_EMAIL_USERNAME, GOFF_EMAIL_PASSWORD; ports: none; requests: {'cpu': '1', 'memory': '512Mi'}; limits: {'cpu': '2', 'memory': '1Gi'}
+
+## Portainer files
+
+- `portainer-stack.yml` - Docker Compose stack to paste/use in Portainer.
+- `portainer-app.env` - bot runtime secrets/env.
+
+## Portainer database connection
+
+This Portainer stack does not include pgbouncer. `DATABASE_URL` in `portainer-app.env` points directly at the external PostgreSQL service copied from the Kubernetes pgbouncer upstream URL.

cmd/goff/main.go

@@ -4,15 +4,15 @@ import (
 	"fmt"
 	"log"
 
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/exts"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/exts/guild_management"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/exts/logging"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/exts/tasks"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/exts/user_management"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/postgres"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/services"
+	"gitea.wayfinderak.com/wayfinderak/goff/pkg/email"
 	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/goff/internal/exts"
-	"github.com/dustinpianalto/goff/internal/exts/guild_management"
-	"github.com/dustinpianalto/goff/internal/exts/logging"
-	"github.com/dustinpianalto/goff/internal/exts/tasks"
-	"github.com/dustinpianalto/goff/internal/exts/user_management"
-	"github.com/dustinpianalto/goff/internal/postgres"
-	"github.com/dustinpianalto/goff/internal/services"
-	"github.com/dustinpianalto/goff/pkg/email"
 
 	//"github.com/MikeModder/anpan"
 	"os"
@@ -124,6 +124,7 @@ func getPrefixes(guildID string) []string {
 		log.Println(err)
 		return []string{"Go.", "go."}
 	}
+	defer rows.Close()
 	var prefixes []string
 	for rows.Next() {
 		var prefix string

deployment.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: goff
-  namespace: default
+  namespace: discord-bots
   labels:
     app: goff
 spec:
@@ -21,8 +21,42 @@ spec:
         app: goff
     spec:
       containers:
+        - name: pgbouncer
+          image: timoha/pgbouncer:1.15.0
+          resources:
+            requests:
+              memory: "256Mi"
+              cpu: "0.5"
+            limits:
+              memory: "512Mi"
+              cpu: "1"
+          env:
+            - name: DATABASE_URL
+              valueFrom:
+                secretKeyRef:
+                  name: goff
+                  key: pgbouncer_url
+            - name: SERVER_TLS_SSLMODE
+              valueFrom:
+                secretKeyRef:
+                  name: goff
+                  key: pgbouncer_ssl
+            - name: AUTH_TYPE
+              valueFrom:
+                secretKeyRef:
+                  name: goff
+                  key: pgbouncer_auth
+          ports:
+            - containerPort: 5432
         - name: goff
           image: <IMAGE>
+          resources:
+            requests:
+              memory: "512Mi"
+              cpu: "1"
+            limits:
+              memory: "1Gi"
+              cpu: "2"
           env:
             - name: DATABASE_URL
               valueFrom:
@@ -45,4 +79,4 @@ spec:
                   name: goff
                   key: email_password
       imagePullSecrets:
-        - name: registry-2
+        - name: registry-1

docker-compose.yml

@@ -0,0 +1,10 @@
+services:
+  goff:
+    image: ${IMAGE:-gitea.wayfinderak.com/wayfinderak/goff:${IMAGE_TAG:-latest}}
+    container_name: goff
+    restart: unless-stopped
+    environment:
+      DATABASE_URL: ${DATABASE_URL}
+      DISCORDGO_TOKEN: ${DISCORDGO_TOKEN}
+      GOFF_EMAIL_USERNAME: ${GOFF_EMAIL_USERNAME}
+      GOFF_EMAIL_PASSWORD: ${GOFF_EMAIL_PASSWORD}

go.mod

@@ -1,4 +1,4 @@
-module github.com/dustinpianalto/goff
+module gitea.wayfinderak.com/wayfinderak/goff
 
 go 1.14
 

internal/exts/guild_management/guild.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/goff/internal/postgres"
-	"github.com/dustinpianalto/goff/internal/services"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/postgres"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/services"
 )
 
 // Guild management commands

internal/exts/guild_management/message_events.go

@@ -5,7 +5,7 @@ import (
 	"log"
 
 	"github.com/bwmarrin/discordgo"
-	"github.com/dustinpianalto/goff/internal/postgres"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/postgres"
 )
 
 func OnMessageUpdate(session *discordgo.Session, m *discordgo.MessageUpdate) {

internal/exts/init.go

@@ -2,15 +2,15 @@ package exts
 
 import (
 	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/goff/internal/exts/fun"
-	"github.com/dustinpianalto/goff/internal/exts/guild_management"
-	"github.com/dustinpianalto/goff/internal/exts/roles"
-	"github.com/dustinpianalto/goff/internal/exts/tags"
-	"github.com/dustinpianalto/goff/internal/exts/tasks"
-	"github.com/dustinpianalto/goff/internal/exts/user_management"
-	"github.com/dustinpianalto/goff/internal/exts/utils"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/exts/fun"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/exts/guild_management"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/exts/roles"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/exts/tags"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/exts/tasks"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/exts/user_management"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/exts/utils"
 
-	"github.com/dustinpianalto/goff/internal/exts/p_interpreter"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/exts/p_interpreter"
 )
 
 func AddCommandHandlers(h *disgoman.CommandManager) {

internal/exts/logging/logging.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/bwmarrin/discordgo"
-	"github.com/dustinpianalto/goff/internal/postgres"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/postgres"
 )
 
 var LoggingChannel = make(chan *LogEvent, 10)

internal/exts/roles/roles.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/bwmarrin/discordgo"
 	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/goff"
-	"github.com/dustinpianalto/goff/internal/postgres"
-	"github.com/dustinpianalto/goff/internal/services"
+	"gitea.wayfinderak.com/wayfinderak/goff"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/postgres"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/services"
 )
 
 var MakeRoleSelfAssignableCommand = &disgoman.Command{

internal/exts/tags/tags.go

@@ -7,9 +7,9 @@ import (
 	"strings"
 
 	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/goff"
-	"github.com/dustinpianalto/goff/internal/postgres"
-	"github.com/dustinpianalto/goff/internal/services"
+	"gitea.wayfinderak.com/wayfinderak/goff"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/postgres"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/services"
 )
 
 var AddTagCommand = &disgoman.Command{

internal/exts/tasks/reminders.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/bwmarrin/discordgo"
-	"github.com/dustinpianalto/goff/internal/postgres"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/postgres"
 )
 
 type Task struct {

internal/exts/tasks/tasks.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/goff/internal/postgres"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/postgres"
 	"github.com/olebedev/when"
 	"github.com/olebedev/when/rules/common"
 	"github.com/olebedev/when/rules/en"

internal/exts/user_management/member_join.go

@@ -4,8 +4,8 @@ import (
 	"log"
 
 	"github.com/bwmarrin/discordgo"
-	"github.com/dustinpianalto/goff"
-	"github.com/dustinpianalto/goff/internal/services"
+	"gitea.wayfinderak.com/wayfinderak/goff"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/services"
 )
 
 func OnGuildMemberAdd(s *discordgo.Session, member *discordgo.GuildMemberAdd) {

internal/exts/user_management/member_logging.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/bwmarrin/discordgo"
-	"github.com/dustinpianalto/goff/internal/discord_utils"
-	"github.com/dustinpianalto/goff/internal/postgres"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/discord_utils"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/postgres"
 )
 
 func OnGuildMemberAddLogging(s *discordgo.Session, member *discordgo.GuildMemberAdd) {

internal/exts/user_management/user_management.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/bwmarrin/discordgo"
 	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/goff/internal/exts/logging"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/exts/logging"
 )
 
 var KickUserCommand = &disgoman.Command{

internal/exts/utils/utils.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/bwmarrin/discordgo"
 	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/goff/internal/discord_utils"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/discord_utils"
 )
 
 var PingCommand = &disgoman.Command{
@@ -80,9 +80,9 @@ var GitCommand = &disgoman.Command{
 
 func gitCommandFunc(ctx disgoman.Context, _ []string) {
 	embed := &discordgo.MessageEmbed{
-		Title: "Hi there, My code is on Github",
+		Title: "Hi there, my code is on Gitea",
 		Color: 0,
-		URL:   "https://github.com/dustinpianalto/Goff",
+		URL:   "https://gitea.wayfinderak.com/wayfinderak/goff",
 	}
 	_, err := ctx.Session.ChannelMessageSendEmbed(ctx.Channel.ID, embed)
 	if err != nil {

internal/postgres/database.go

@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 	"log"
+	"time"
 
 	_ "github.com/lib/pq"
 )
@@ -16,17 +17,23 @@ func ConnectDatabase(dbConnString string) {
 	db, err := sql.Open("postgres", dbConnString)
 	if err != nil {
 		panic(fmt.Sprintf("Can't connect to the database. %v", err))
-	} else {
-		fmt.Println("Database Connected.")
 	}
-	db.SetMaxOpenConns(75) // The RDS instance has a max of 75 open connections
-	db.SetMaxIdleConns(5)
-	db.SetConnMaxLifetime(300)
+
+	db.SetMaxOpenConns(5)
+	db.SetMaxIdleConns(2)
+	db.SetConnMaxLifetime(30 * time.Minute)
+	db.SetConnMaxIdleTime(5 * time.Minute)
+
+	if err = db.Ping(); err != nil {
+		panic(fmt.Sprintf("Can't ping the database. %v", err))
+	}
+
+	fmt.Println("Database Connected.")
 	DB = db
 }
 
 func InitializeDatabase() {
-	_, err := DB.Query("CREATE TABLE IF NOT EXISTS users(" +
+	_, err := DB.Exec("CREATE TABLE IF NOT EXISTS users(" +
 		"id varchar(30) primary key," +
 		"banned bool not null default false," +
 		"logging bool not null default true," +
@@ -38,7 +45,7 @@ func InitializeDatabase() {
 	if err != nil {
 		fmt.Println(err)
 	}
-	_, err = DB.Query("CREATE TABLE IF NOT EXISTS guilds(" +
+	_, err = DB.Exec("CREATE TABLE IF NOT EXISTS guilds(" +
 		"id varchar(30) primary key," +
 		"welcome_message varchar(1000) NOT NULL DEFAULT ''," +
 		"goodbye_message varchar(1000) NOT NULL DEFAULT ''," +
@@ -48,14 +55,14 @@ func InitializeDatabase() {
 	if err != nil {
 		fmt.Println(err)
 	}
-	_, err = DB.Query("CREATE TABLE IF NOT EXISTS prefixes(" +
+	_, err = DB.Exec("CREATE TABLE IF NOT EXISTS prefixes(" +
 		"id serial primary key," +
 		"prefix varchar(10) not null unique default 'Go.'" +
 		")")
 	if err != nil {
 		fmt.Println(err)
 	}
-	_, err = DB.Query("CREATE TABLE IF NOT EXISTS tags(" +
+	_, err = DB.Exec("CREATE TABLE IF NOT EXISTS tags(" +
 		"id serial primary key," +
 		"tag varchar(100) not null unique," +
 		"content varchar(1000) not null," +
@@ -66,21 +73,21 @@ func InitializeDatabase() {
 	if err != nil {
 		fmt.Println(err)
 	}
-	_, err = DB.Query("CREATE TABLE IF NOT EXISTS x_users_guilds(" +
+	_, err = DB.Exec("CREATE TABLE IF NOT EXISTS x_users_guilds(" +
 		"guild_id varchar(30) not null references guilds(id)," +
 		"user_id varchar(30) not null references users(id)" +
 		")")
 	if err != nil {
 		fmt.Println(err)
 	}
-	_, err = DB.Query("CREATE TABLE IF NOT EXISTS x_guilds_prefixes(" +
+	_, err = DB.Exec("CREATE TABLE IF NOT EXISTS x_guilds_prefixes(" +
 		"guild_id varchar(30) not null references guilds(id)," +
 		"prefix_id int not null references prefixes(id)" +
 		")")
 	if err != nil {
 		fmt.Println(err)
 	}
-	_, err = DB.Query("CREATE TABLE IF NOT EXISTS tasks(" +
+	_, err = DB.Exec("CREATE TABLE IF NOT EXISTS tasks(" +
 		"id serial primary key," +
 		"type varchar(10) not null," +
 		"content text not null," +
@@ -94,7 +101,7 @@ func InitializeDatabase() {
 	if err != nil {
 		fmt.Println(err)
 	}
-	_, err = DB.Query(`CREATE TABLE IF NOT EXISTS postfixes(
+	_, err = DB.Exec(`CREATE TABLE IF NOT EXISTS postfixes(
 		id serial primary key,
 		name varchar(100) not null,
 		time timestamp not null default NOW())`)
@@ -119,37 +126,37 @@ func InitializeDatabase() {
 }
 
 func LoadTestData() {
-	_, err := DB.Query("INSERT INTO users (id, banned, logging, steam_id, is_active, is_staff, is_admin) values " +
+	_, err := DB.Exec("INSERT INTO users (id, banned, logging, steam_id, is_active, is_staff, is_admin) values " +
 		"('351794468870946827', false, true, '76561198024193239', true, true, true)," +
 		"('692908139506434065', false, true, '', true, false, false)," +
 		"('396588996706304010', false, true, '', true, true, false)")
 	if err != nil {
 		fmt.Println(err)
 	}
-	_, err = DB.Query("INSERT INTO guilds (id, welcome_message, goodbye_message) VALUES " +
+	_, err = DB.Exec("INSERT INTO guilds (id, welcome_message, goodbye_message) VALUES " +
 		"('265828729970753537', 'Hey there is someone new here.', 'Well fine then... Just leave without saying goodbye')")
 	if err != nil {
 		fmt.Println(err)
 	}
-	_, err = DB.Query("INSERT INTO prefixes (prefix) VALUES ('Godev.'), ('godev.'), ('godev,')")
+	_, err = DB.Exec("INSERT INTO prefixes (prefix) VALUES ('Godev.'), ('godev.'), ('godev,')")
 	if err != nil {
 		fmt.Println(err)
 	}
-	_, err = DB.Query("INSERT INTO x_users_guilds (guild_id, user_id) VALUES " +
+	_, err = DB.Exec("INSERT INTO x_users_guilds (guild_id, user_id) VALUES " +
 		"('265828729970753537', '351794468870946827')," +
 		"('265828729970753537', '692908139506434065')," +
 		"('265828729970753537', '396588996706304010')")
 	if err != nil {
 		fmt.Println(err)
 	}
-	_, err = DB.Query("INSERT INTO x_guilds_prefixes (guild_id, prefix_id) VALUES " +
+	_, err = DB.Exec("INSERT INTO x_guilds_prefixes (guild_id, prefix_id) VALUES " +
 		"('265828729970753537', 1)," +
 		"('265828729970753537', 2)," +
 		"('265828729970753537', 3)")
 	if err != nil {
 		fmt.Println(err)
 	}
-	_, err = DB.Query("INSERT INTO tags (tag, content, creator, guild_id) VALUES " +
+	_, err = DB.Exec("INSERT INTO tags (tag, content, creator, guild_id) VALUES " +
 		"('test', 'This is a test of the tag system', '351794468870946827', '265828729970753537')")
 	if err != nil {
 		fmt.Println(err)

internal/postgres/guild.go

@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"log"
 
-	"github.com/dustinpianalto/goff"
+	"gitea.wayfinderak.com/wayfinderak/goff"
 )
 
 type GuildService struct {

internal/postgres/postfixes.go

@@ -47,8 +47,10 @@ func RunPostfixes() {
 			continue
 		}
 		if rows.Next() {
+			rows.Close()
 			continue
 		} else {
+			rows.Close()
 			err := postfix.Invoke(false)
 			if err != nil {
 				continue

internal/postgres/roles.go

@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"log"
 
-	"github.com/dustinpianalto/goff"
+	"gitea.wayfinderak.com/wayfinderak/goff"
 )
 
 type RoleService struct {

internal/postgres/user.go

@@ -3,7 +3,7 @@ package postgres
 import (
 	"database/sql"
 
-	"github.com/dustinpianalto/goff"
+	"gitea.wayfinderak.com/wayfinderak/goff"
 )
 
 type UserService struct {

internal/services/services.go

@@ -1,6 +1,6 @@
 package services
 
-import "github.com/dustinpianalto/goff"
+import "gitea.wayfinderak.com/wayfinderak/goff"
 
 var UserService goff.UserService
 var GuildService goff.GuildService

pkg/email/email.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/bwmarrin/discordgo"
-	"github.com/dustinpianalto/goff/pkg/puzzles"
+	"gitea.wayfinderak.com/wayfinderak/goff/pkg/puzzles"
 	imap "github.com/emersion/go-imap"
 	"github.com/emersion/go-imap/client"
 	"github.com/emersion/go-message/mail"

pkg/puzzles/puzzles.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/bwmarrin/discordgo"
-	"github.com/dustinpianalto/goff"
-	"github.com/dustinpianalto/goff/internal/postgres"
+	"gitea.wayfinderak.com/wayfinderak/goff"
+	"gitea.wayfinderak.com/wayfinderak/goff/internal/postgres"
 	"github.com/emersion/go-message/mail"
 )
 

portainer-app.env.example

@@ -0,0 +1,4 @@
+DATABASE_URL=postgresql://USER:PASSWORD@HOST:5432/goff?sslmode=disable
+DISCORDGO_TOKEN=replace-me
+GOFF_EMAIL_USERNAME=replace-me
+GOFF_EMAIL_PASSWORD=replace-me

portainer-stack.yml

@@ -0,0 +1,9 @@
+services:
+  goff:
+    image: gitea.wayfinderak.com/wayfinderak/goff:latest
+    container_name: goff
+    restart: unless-stopped
+    env_file:
+      - ./portainer-app.env
+    mem_limit: 1g
+    cpus: "2.0"