feat: update docker for sqlite

Author: ecshreve

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM golang:1.20-alpine
+FROM golang:1.20
 
 WORKDIR /app
 
@@ -9,6 +9,7 @@ COPY go.sum ./
 RUN go mod download
 
 COPY ./cmd/server ./cmd/server
+COPY ./data/sqlite ./data/sqlite
 COPY ./pkg ./pkg
 COPY ./docs ./docs
 COPY ./static/site ./static/site

cmd/server/main.go

@@ -9,15 +9,15 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-// @title			Jepp API Documentation
-// @description	This is a simple api to access jeopardy data.
-// @version		1.0
-// @BasePath		/api
+//	@title			Jepp API Documentation
+//	@description	This is a simple api to access jeopardy data.
+//	@version		1.0
+//	@BasePath		/api
 //
-// @contact.name	shreve
+//	@contact.name	shreve
 //
-// @license.name	MIT License
-// @license.url	https://github.com/ecshreve/jepp/blob/main/LICENSE
+//	@license.name	MIT License
+//	@license.url	https://github.com/ecshreve/jepp/blob/main/LICENSE
 func main() {
 	if os.Getenv("JEPP_ENV") == "prod" {
 		docs.SwaggerInfo.Host = "jepp.app"

docker-compose.yml

@@ -1,54 +1,12 @@
 version: '3.1'
 
 services:  
-  db:
-    image: mariadb:10.11.3
-    restart: unless-stopped
-    environment:
-      MARIADB_DATABASE: jeppdb
-      MARIADB_USER: jepp
-      MARIADB_PASSWORD: jepp
-      MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: true
-      MARIADB_MYSQL_LOCALHOST_USER: true
-    ports:
-      - 3306:3306
-    volumes:
-      - db-data:/var/lib/mysql
-      - ./data/dump.sql.gz:/docker-entrypoint-initdb.d/dump.sql.gz
-    healthcheck:
-      test: ["CMD", "/usr/local/bin/healthcheck.sh", "--connect", "--innodb_initialized"]
-      interval: 30s
-      timeout: 30s
-      retries: 10
-      start_period: 30s
-
-  api:
-    build: 
+  app:
+    build:
       context: .
       dockerfile: Dockerfile
     restart: unless-stopped
     environment:
       JEPP_ENV: ${JEPP_ENV}
-      JEPP_DB_HOST: db
-      JEPP_DB_PASSWORD: ""
     ports:
       - 8880:8880
-    depends_on:
-      db:
-        condition: service_healthy
-
-  # useful for local development
-  #
-  # adminer:
-  #   image: adminer
-  #   restart: unless-stopped
-  #   depends_on:
-  #     db:
-  #       condition: service_healthy
-  #   ports:
-  #     - 8881:8080
-
-
-volumes:
-  db-data:
-    driver: local

pkg/models/category.go

@@ -66,7 +66,6 @@ func (db *JeppDB) InsertCategory(name string) (*Category, error) {
 	if err := tx.Commit(); err == nil {
 		lid, _ := res.LastInsertId()
 		cat = &Category{CategoryID: lid, Name: name}
-		db.LastCategoryID = lid
 		log.Debugf("inserted category -- %+v", cat)
 	} else {
 		return nil, oops.Wrapf(err, "could not insert category: %v", name)

pkg/models/models.go

@@ -3,21 +3,13 @@ package models
 import (
 	"github.com/jmoiron/sqlx"
 	_ "github.com/mattn/go-sqlite3"
-	log "github.com/sirupsen/logrus"
 )
 
 type JeppDB struct {
 	*sqlx.DB
-	LastCategoryID int64
 }
 
 func NewJeppDB(dbfile string) *JeppDB {
 	db := sqlx.MustOpen("sqlite3", dbfile)
-	var lid int64
-	if err := db.Get(&lid, "SELECT MAX(category_id) FROM category"); err != nil {
-		log.Debugf("could not get last category id: %v", err)
-		return nil
-	}
-	db.Get(&lid, "SELECT MAX(id) FROM category")
-	return &JeppDB{DB: db, LastCategoryID: lid}
+	return &JeppDB{DB: db}
 }