From ba75e2ac7cd79831c356c2d89a29b635c8d29277 Mon Sep 17 00:00:00 2001
From: Stewart Jingga <stewart_jingga@yahoo.com>
Date: Sat, 6 Nov 2021 15:56:03 +0700
Subject: [PATCH] chore: change Dockerfile file naming

---
 .github/workflows/build_dev.yml |  1 +
 .goreleaser.yml                 |  2 +-
 Dockerfile                      |  8 ++------
 Dockerfile.dev                  | 11 +++++++++++
 Dockerfile.production           |  7 -------
 5 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 Dockerfile.dev
 delete mode 100644 Dockerfile.production

diff --git a/.github/workflows/build_dev.yml b/.github/workflows/build_dev.yml
index 25dc32114..fe3eaecea 100644
--- a/.github/workflows/build_dev.yml
+++ b/.github/workflows/build_dev.yml
@@ -18,5 +18,6 @@ jobs:
       uses: docker/build-push-action@v2
       with:
         push: true
+        file: "{context}/Dockerfile.dev"
         tags: |
             odpf/meteor:dev
diff --git a/.goreleaser.yml b/.goreleaser.yml
index e54a9afc2..512916d60 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -54,7 +54,7 @@ dockers:
     goarch: amd64
     ids:
       - meteor
-    dockerfile: Dockerfile.production
+    dockerfile: Dockerfile
     image_templates:
       - 'docker.io/odpf/{{.ProjectName}}:latest'
       - 'docker.io/odpf/{{.ProjectName}}:{{ .Version }}'
diff --git a/Dockerfile b/Dockerfile
index 180292a22..477f74996 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,6 @@
-FROM golang:1.16-stretch as base
-WORKDIR /build/
-COPY . .
-RUN ["make", "build-dev"]
-
 FROM alpine:latest
-COPY --from=base /build/meteor /usr/bin/meteor
+
+COPY meteor /usr/bin/meteor
 RUN apk update
 RUN apk add ca-certificates
 
diff --git a/Dockerfile.dev b/Dockerfile.dev
new file mode 100644
index 000000000..180292a22
--- /dev/null
+++ b/Dockerfile.dev
@@ -0,0 +1,11 @@
+FROM golang:1.16-stretch as base
+WORKDIR /build/
+COPY . .
+RUN ["make", "build-dev"]
+
+FROM alpine:latest
+COPY --from=base /build/meteor /usr/bin/meteor
+RUN apk update
+RUN apk add ca-certificates
+
+CMD ["meteor"]
diff --git a/Dockerfile.production b/Dockerfile.production
deleted file mode 100644
index 477f74996..000000000
--- a/Dockerfile.production
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM alpine:latest
-
-COPY meteor /usr/bin/meteor
-RUN apk update
-RUN apk add ca-certificates
-
-CMD ["meteor"]