From 516a08a17ee9150220abeec0d5dff72099fd2dcd Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Sat, 9 May 2020 15:15:34 -0700
Subject: fix dockerfile envs

---
 Dockerfile | 6 +++---
 db/db.go   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5a14889..41a3dcc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,6 @@ COPY . /app/src
 WORKDIR /app/src
 
 RUN apk add git ca-certificates
-RUN go mod download
 
 # Build image
 RUN CGO_ENABLED=0 GOOS=linux go build -o /go/bin/app
@@ -16,10 +15,11 @@ RUN CGO_ENABLED=0 GOOS=linux go build -o /go/bin/app
 FROM scratch
 
 # Copy app
-COPY --from=builder /go/bin/app /go/bin/app
+COPY --from=builder /go/bin/app ./
+COPY .env ./
 
 # Expose ports, change port to whatever you need to expose
 EXPOSE 8080
 
 # Run app
-ENTRYPOINT ["/go/bin/app"]
\ No newline at end of file
+ENTRYPOINT ["./app"]
\ No newline at end of file
diff --git a/db/db.go b/db/db.go
index a6f439e..4a932f5 100644
--- a/db/db.go
+++ b/db/db.go
@@ -12,7 +12,7 @@ func init() {
 	// load .env file
 	err := godotenv.Load()
 	if err != nil {
-		log.Fatal("Error loading .env file")
+		log.Fatal("Error loading .env file: %s", err.Error())
 	}
 
 	mUser := os.Getenv("MONGO_USER")
-- 
cgit v1.2.3


From af0031eadbfe88fe8125c0add97d71f1c7fcc801 Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Sat, 9 May 2020 15:51:00 -0700
Subject: fix port bug

---
 Dockerfile     | 1 +
 cache/cache.go | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 41a3dcc..b533070 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build -o /go/bin/app
 FROM scratch
 
 # Copy app
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /go/bin/app ./
 COPY .env ./
 
diff --git a/cache/cache.go b/cache/cache.go
index da27939..b311efa 100644
--- a/cache/cache.go
+++ b/cache/cache.go
@@ -19,10 +19,12 @@ func New() *Cache {
 
 func (c *Cache) Get(hash string) (db.Paste, error) {
 	c.lock.RLock()
-	defer c.lock.RUnlock()
 
 	// check if hash in cache
-	if v, ok := c.m[hash]; ok {
+	v, ok := c.m[hash]
+	c.lock.RUnlock()
+
+	if ok {
 		return v, nil
 	}
 
@@ -34,6 +36,7 @@ func (c *Cache) Get(hash string) (db.Paste, error) {
 
 func (c *Cache) add(p db.Paste) {
 	c.lock.Lock()
+	defer c.lock.Unlock()
+
 	c.m[p.Hash] = p
-	c.lock.Unlock()
 }
-- 
cgit v1.2.3