Merge pull request #91 from EchoVault/fix/main.go

Moved main.go to cmd/main.go
EchoVault · Jul 9, 2024 · c58af7f · c58af7f
2 parents e81245f + 1bc9e9a
commit c58af7f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -27,7 +27,7 @@ jobs:
         go-version: '1.21.4'
 
     - name: Build
-      run: go build -v -o bin/echovault .
+      run: go build -v -o bin/echovault ./cmd/...
 
     - name: Test
       run: make test

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -1,12 +1,12 @@
-version: 1
+version: 2
 
 before:
   hooks:
     - go mod tidy
     - go generate ./...
 
 builds:
-  - main: .
+  - main: ./cmd
     env:
       - CGO_ENABLED=0
     goos:

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -12,7 +12,7 @@ RUN  CGO_ENABLED=$CGO_ENABLED CC=$CC GOOS=$GOOS GOARCH=$GOARCH go build -buildmo
 RUN CGO_ENABLED=$CGO_ENABLED CC=$CC GOOS=$GOOS GOARCH=$GOARCH go build -buildmode=plugin -o $DEST/module_get/module_get.so ./internal/volumes/modules/module_get/module_get.go
 
 ENV DEST=bin
-RUN CGO_ENABLED=$CGO_ENABLED CC=$CC GOOS=$GOOS GOARCH=$GOARCH go build -o $DEST/server .
+RUN CGO_ENABLED=$CGO_ENABLED CC=$CC GOOS=$GOOS GOARCH=$GOARCH go build -o $DEST/server ./cmd/...
 
 
 

diff --git a/Dockerfile.prod b/Dockerfile.prod
@@ -2,7 +2,7 @@ FROM --platform=linux/amd64 golang:alpine AS build
 RUN apk add --no-cache gcc musl-dev
 WORKDIR /build
 COPY . ./
-RUN CGO_ENABLED=1 CC=gcc GOOS=linux GOARCH=amd64 go build -o bin/server .
+RUN CGO_ENABLED=1 CC=gcc GOOS=linux GOARCH=amd64 go build -o bin/server ./cmd/...
 
 FROM --platform=linux/amd64 alpine:latest AS server
 RUN mkdir -p /usr/echovault/bin

diff --git a/main.go → cmd/main.go b/main.go → cmd/main.go