Improve dockerfiles (#185)

hobbyfarm · Mar 14, 2024 · 90af714 · 90af714
1 parent 335cc4a
commit 90af714
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 36 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,11 +2,13 @@
 FROM golang:1.21.1 AS sdk
 
 WORKDIR /app
-COPY . .
+COPY go.mod .
 
 # Change to the directory of the service.
 RUN go mod download -x
 
+COPY . .
+
 # Build the service. The output binary is named "app".
 RUN CGO_ENABLED=0 GOOS=linux go build -v -o /tmp/app
 

diff --git a/v3/services/accesscodesvc/Dockerfile b/v3/services/accesscodesvc/Dockerfile
@@ -1,15 +1,17 @@
 ##### sdk image #####
 FROM golang:1.21.1 AS sdk
 
-WORKDIR /app
-
-# Copy everything, respecting .dockerignore.
-COPY . .
-
 # Change to the directory of the service.
 WORKDIR /app/v3/services/accesscodesvc
+
+COPY /v3/services/accesscodesvc/go.mod .
+COPY /v3/go.mod /app/v3
+
 RUN go mod download
 
+# Copy everything, respecting .dockerignore.
+COPY . /app
+
 # Build the service. The output binary is named "app".
 RUN CGO_ENABLED=0 GOOS=linux go build -o /tmp/app
 

diff --git a/v3/services/authnsvc/Dockerfile b/v3/services/authnsvc/Dockerfile
@@ -1,15 +1,17 @@
 ##### sdk image #####
 FROM golang:1.21.1 AS sdk
 
-WORKDIR /app
-
-# Copy everything, respecting .dockerignore.
-COPY . .
-
 # Change to the directory of the service.
 WORKDIR /app/v3/services/authnsvc
+
+COPY /v3/services/authnsvc/go.mod .
+COPY /v3/go.mod /app/v3
+
 RUN go mod download
 
+# Copy everything, respecting .dockerignore.
+COPY . /app
+
 # Build the service. The output binary is named "app".
 RUN CGO_ENABLED=0 GOOS=linux go build -o /tmp/app
 

diff --git a/v3/services/authrsvc/Dockerfile b/v3/services/authrsvc/Dockerfile
@@ -1,15 +1,17 @@
 ##### sdk image #####
 FROM golang:1.21.1 AS sdk
 
-WORKDIR /app
-
-# Copy everything, respecting .dockerignore.
-COPY . .
-
 # Change to the directory of the service.
 WORKDIR /app/v3/services/authrsvc
+
+COPY /v3/services/authrsvc/go.mod .
+COPY /v3/go.mod /app/v3
+
 RUN go mod download
 
+# Copy everything, respecting .dockerignore.
+COPY . /app
+
 # Build the service. The output binary is named "app".
 RUN CGO_ENABLED=0 GOOS=linux go build -o /tmp/app
 

diff --git a/v3/services/conversionsvc/Dockerfile b/v3/services/conversionsvc/Dockerfile
@@ -1,15 +1,17 @@
 ##### sdk image #####
 FROM golang:1.21.1 AS sdk
 
-WORKDIR /app
-
-# Copy everything, respecting .dockerignore.
-COPY . .
-
 # Change to the directory of the service.
 WORKDIR /app/v3/services/conversionsvc
+
+COPY /v3/services/conversionsvc/go.mod .
+COPY /v3/go.mod /app/v3
+
 RUN go mod download
 
+# Copy everything, respecting .dockerignore.
+COPY . /app
+
 # Build the service. The output binary is named "app".
 RUN CGO_ENABLED=0 GOOS=linux go build -o /tmp/app
 

diff --git a/v3/services/rbacsvc/Dockerfile b/v3/services/rbacsvc/Dockerfile
@@ -1,15 +1,17 @@
 ##### sdk image #####
 FROM golang:1.21.1 AS sdk
 
-WORKDIR /app
-
-# Copy everything, respecting .dockerignore.
-COPY . .
-
 # Change to the directory of the service.
 WORKDIR /app/v3/services/rbacsvc
+
+COPY /v3/services/rbacsvc/go.mod .
+COPY /v3/go.mod /app/v3
+
 RUN go mod download
 
+# Copy everything, respecting .dockerignore.
+COPY . /app
+
 # Build the service. The output binary is named "app".
 RUN CGO_ENABLED=0 GOOS=linux go build -o /tmp/app
 

diff --git a/v3/services/settingsvc/Dockerfile b/v3/services/settingsvc/Dockerfile
@@ -1,15 +1,17 @@
 ##### sdk image #####
 FROM golang:1.21.1 AS sdk
 
-WORKDIR /app
-
-# Copy everything, respecting .dockerignore.
-COPY . .
-
 # Change to the directory of the service.
 WORKDIR /app/v3/services/settingsvc
+
+COPY /v3/services/settingsvc/go.mod .
+COPY /v3/go.mod /app/v3
+
 RUN go mod download
 
+# Copy everything, respecting .dockerignore.
+COPY . /app
+
 # Build the service. The output binary is named "app".
 RUN CGO_ENABLED=0 GOOS=linux go build -o /tmp/app
 

diff --git a/v3/services/usersvc/Dockerfile b/v3/services/usersvc/Dockerfile
@@ -1,15 +1,17 @@
 ##### sdk image #####
 FROM golang:1.21.1 AS sdk
 
-WORKDIR /app
-
-# Copy everything, respecting .dockerignore.
-COPY . .
-
 # Change to the directory of the service.
 WORKDIR /app/v3/services/usersvc
+
+COPY /v3/services/usersvc/go.mod .
+COPY /v3/go.mod /app/v3
+
 RUN go mod download
 
+# Copy everything, respecting .dockerignore.
+COPY . /app
+
 # Build the service. The output binary is named "app".
 RUN CGO_ENABLED=0 GOOS=linux go build -o /tmp/app