From b40d3a3d04ef165a2c64bef7bcdb26647cf0bb0b Mon Sep 17 00:00:00 2001
From: Cameron Schultz <camschultz32@gmail.com>
Date: Tue, 20 Feb 2024 10:26:48 -0600
Subject: [PATCH 1/2] use golang layer

---
 .github/workflows/release.yml | 1 +
 .goreleaser.yml               | 2 ++
 Dockerfile.release            | 6 +++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0294e56b..4c7b9dbc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -74,3 +74,4 @@ jobs:
           # https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DOCKERFILE: ./Dockerfile.release
+          GO_VERSION: ${{ env.GO_VERSION }}
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 00614397..217ad3fc 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -36,6 +36,7 @@ dockers:
     build_flag_templates:
     - "--pull"
     - "--platform=linux/amd64"
+    - "--build-arg=GO_VERSION={{ .Env.GO_VERSION }}"
   - image_templates:
     - 'avaplatform/awm-relayer:{{ .Tag }}-arm64'
     dockerfile: "{{ .Env.DOCKERFILE }}"
@@ -43,6 +44,7 @@ dockers:
     build_flag_templates:
     - "--pull"
     - "--platform=linux/arm64"
+    - "--build-arg=GO_VERSION={{ .Env.GO_VERSION }}"
     goarch: arm64
 docker_manifests:
   - name_template: 'avaplatform/awm-relayer:{{ .Tag }}'
diff --git a/Dockerfile.release b/Dockerfile.release
index 081a1f8c..713622c2 100644
--- a/Dockerfile.release
+++ b/Dockerfile.release
@@ -1,3 +1,7 @@
-FROM debian:11-slim
+ARG GO_VERSION
+FROM golang:${GO_VERSION}
 COPY awm-relayer /usr/bin/awm-relayer
+EXPOSE 8080
+USER 1001
+CMD ["start"]
 ENTRYPOINT [ "/usr/bin/awm-relayer" ]
\ No newline at end of file

From eeeea4bc3b1315a1607efe47bffa75f46a4b09ab Mon Sep 17 00:00:00 2001
From: Cameron Schultz <camschultz32@gmail.com>
Date: Tue, 20 Feb 2024 12:32:31 -0600
Subject: [PATCH 2/2] remove unused dockerfile

---
 .github/workflows/release.yml |  1 -
 .goreleaser.yml               |  2 --
 Dockerfile                    | 16 ++--------------
 Dockerfile.release            |  7 -------
 4 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 Dockerfile.release

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4c7b9dbc..55ffa03c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -73,5 +73,4 @@ jobs:
         env:
           # https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DOCKERFILE: ./Dockerfile.release
           GO_VERSION: ${{ env.GO_VERSION }}
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 217ad3fc..8c98c5f2 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -31,7 +31,6 @@ builds:
 dockers:
   - image_templates:
     - 'avaplatform/awm-relayer:{{ .Tag }}-amd64'
-    dockerfile: "{{ .Env.DOCKERFILE }}"
     use: buildx
     build_flag_templates:
     - "--pull"
@@ -39,7 +38,6 @@ dockers:
     - "--build-arg=GO_VERSION={{ .Env.GO_VERSION }}"
   - image_templates:
     - 'avaplatform/awm-relayer:{{ .Tag }}-arm64'
-    dockerfile: "{{ .Env.DOCKERFILE }}"
     use: buildx
     build_flag_templates:
     - "--pull"
diff --git a/Dockerfile b/Dockerfile
index 5337fd22..713622c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,7 @@
-### Build Stage ###
-ARG GO_VERSION
-FROM golang:${GO_VERSION}-bullseye as build
-
-WORKDIR /go/src
-# Copy the code into the container
-COPY . .
-RUN go mod tidy
-# Build awm-relayer
-RUN bash ./scripts/build.sh
-
-### RUN Stage ###
 ARG GO_VERSION
 FROM golang:${GO_VERSION}
-COPY --from=build /go/src/build/awm-relayer /usr/bin/awm-relayer
+COPY awm-relayer /usr/bin/awm-relayer
 EXPOSE 8080
 USER 1001
 CMD ["start"]
-ENTRYPOINT ["/usr/bin/awm-relayer"]
+ENTRYPOINT [ "/usr/bin/awm-relayer" ]
\ No newline at end of file
diff --git a/Dockerfile.release b/Dockerfile.release
deleted file mode 100644
index 713622c2..00000000
--- a/Dockerfile.release
+++ /dev/null
@@ -1,7 +0,0 @@
-ARG GO_VERSION
-FROM golang:${GO_VERSION}
-COPY awm-relayer /usr/bin/awm-relayer
-EXPOSE 8080
-USER 1001
-CMD ["start"]
-ENTRYPOINT [ "/usr/bin/awm-relayer" ]
\ No newline at end of file