From 6d7a998c45b069029a5539e35523e99ff585abcd Mon Sep 17 00:00:00 2001
From: Kevin Kandlbinder <kevin@kevink.dev>
Date: Sat, 11 Mar 2023 14:22:23 +0100
Subject: [PATCH] Switch Docker base image to Ubuntu

---
 Dockerfile                |  4 ++--
 docker-compose.yml        |  2 ++
 graph/schema.resolvers.go | 10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d38be76..3a0739c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,9 +18,9 @@ RUN --mount=type=cache,target=~/.cache/go-build,type=cache,target=~/go/pkg/mod C
 ##
 ## Package
 ##
-FROM alpine:3.15
+FROM ubuntu:lunar
 
-RUN apk add gcompat libgcc libstdc++
+#RUN apk add gcompat libgcc libstdc++
 
 EXPOSE 8080
 WORKDIR /app
diff --git a/docker-compose.yml b/docker-compose.yml
index 4f42d95..91eb6d0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,5 +10,7 @@ services:
       - local
     volumes:
       - ./data:/data
+    env_file:
+      - .env
 networks:
   local:
diff --git a/graph/schema.resolvers.go b/graph/schema.resolvers.go
index 86511e9..6e1f3c0 100644
--- a/graph/schema.resolvers.go
+++ b/graph/schema.resolvers.go
@@ -7,18 +7,18 @@ package graph
 import (
 	"context"
 	"errors"
-	"github.com/99designs/gqlgen/graphql"
-	"github.com/Unkn0wnCat/calapi/internal/auth"
-	"github.com/Unkn0wnCat/calapi/internal/logger"
-	"github.com/go-chi/chi/middleware"
-	"go.uber.org/zap"
 	"strconv"
 	"time"
 
+	"github.com/99designs/gqlgen/graphql"
 	"github.com/Unkn0wnCat/calapi/graph/model"
+	"github.com/Unkn0wnCat/calapi/internal/auth"
 	"github.com/Unkn0wnCat/calapi/internal/database"
 	"github.com/Unkn0wnCat/calapi/internal/db_model"
+	"github.com/Unkn0wnCat/calapi/internal/logger"
+	"github.com/go-chi/chi/middleware"
 	"github.com/objectbox/objectbox-go/objectbox"
+	"go.uber.org/zap"
 )
 
 // Events is the resolver for the events field.