feat: optimised docker build

backend/Dockerfile

@@ -1,21 +1,27 @@
 FROM golang:1.21 AS builder
 
 WORKDIR /src
-COPY . .
+
+COPY go.mod go.sum ./
+
 RUN go mod download
-RUN CGO_ENABLED=1 GOOS=linux go build -o /app --tags "fts5" -a -ldflags '-linkmode external -extldflags "-static"' .
 
-FROM busybox:1.36-musl
+COPY . .
+
+RUN CGO_ENABLED=1 GOOS=linux go build -o ./build --tags "fts5" -a -ldflags '-linkmode external -extldflags "-static"' .
+
+FROM alpine:latest AS app
+
+RUN apk --no-cache add bash nginx ca-certificates tzdata
+
+ENV TZ="Asia/Kolkata"
+
+WORKDIR /app
 
-# Copy metaploy configuration
-COPY metaploy/iqps.metaploy.conf /
-COPY metaploy/postinstall.sh /
+COPY metaploy/ ./
 
-# Set the postinstall script as executable
-RUN chmod +x /postinstall.sh
+RUN chmod +x ./postinstall.sh
 
-# Copy the binary from the builder
-COPY --from=builder /app /app
+COPY --from=builder /src/build .
 
-# Run postinstall script and the binary
-CMD ["/postinstall.sh", "/app"]
+CMD ["./postinstall.sh", "./build"]

backend/docker-compose.yaml

@@ -4,6 +4,8 @@ services:
  container_name: iqps-backend
  build: .
  restart: always
+ env_file:
+ - .env
  networks:
  metaploy-network:
  aliases:
@@ -13,15 +15,6 @@ services:
  - ./db:/db
  - nginx-config-volume:/etc/nginx/sites-enabled
  - odins-vault:/srv/static
- environment:
- - STATIC_FILES_URL=${STATIC_FILES_URL}
- - STATIC_FILES_STORAGE_LOCATION=${STATIC_FILES_STORAGE_LOCATION}
- - DB_NAME=${DB_NAME}
- - DB_HOST=${DB_HOST}
- - DB_PORT=${DB_PORT}
- - DB_USER=${DB_USER}
- - DB_PASSWORD=${DB_PASSWORD}
- - UPLOADED_QPS_PATH=${UPLOADED_QPS_PATH}
 
 networks:
  metaploy-network:

backend/go.mod

@@ -2,9 +2,6 @@ module github.com/metakgp/iqps/backend
 
 go 1.21.6
 
-require (
- github.com/joho/godotenv v1.5.1
- github.com/rs/cors v1.10.1
-)
+require github.com/rs/cors v1.10.1
 
 require github.com/lib/pq v1.10.9

backend/go.sum

@@ -1,5 +1,3 @@
-github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
-github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo=

backend/main.go

@@ -14,7 +14,6 @@ import (
  "strings"
  "time"
 
- "github.com/joho/godotenv"
  "github.com/rs/cors"
 
  _ "github.com/lib/pq"
@@ -316,11 +315,6 @@ func CheckError(err error) {
 }
 
 func main() {
- err := godotenv.Load(".env")
- if err != nil {
- log.Println(err)
- }
-
  host := os.Getenv("DB_HOST")
  port, err := strconv.Atoi(os.Getenv("DB_PORT"))
  CheckError(err)

backend/metaploy/postinstall.sh

@@ -9,8 +9,6 @@ trap 'cleanup' SIGQUIT SIGTERM SIGHUP
 
 "${@}" &
 
-cp /iqps.metaploy.conf /etc/nginx/sites-enabled
+cp ./iqps.metaploy.conf /etc/nginx/sites-enabled
 
 wait $!
-
-echo "lmao"