Skip to content

Commit

Permalink
refactor: package structure
Browse files Browse the repository at this point in the history
  • Loading branch information
diegolnasc committed Dec 24, 2022
1 parent ff0b7a8 commit 100bd16
Show file tree
Hide file tree
Showing 19 changed files with 768 additions and 370 deletions.
34 changes: 24 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,28 @@
FROM golang:alpine AS builder

ENV BINARY_FOLDER=bin
ENV BINARY_NAME=gotcha
ARG BINARY_FOLDER=bin
ARG BINARY_NAME=gotcha
ARG GOOS=linux
ARG GOARCH=amd64

WORKDIR $GOPATH/gotcha
COPY . $GOPATH/gotcha/
RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
RUN go fmt ./cmd/ ./pkg/config/ ./pkg/github/
RUN CGO_ENABLED=0 GOOS=${GOOS} GOARCH=${GOARCH} go build -ldflags="-s -w" -o ${BINARY_FOLDER}/${BINARY_NAME} ./cmd/main.go
FROM golang:1.18 AS builder

ARG BINARY_FOLDER
ARG BINARY_NAME
ARG GOOS
ARG GOARCH

WORKDIR /app
COPY . .
RUN CGO_ENABLED=0 GOOS=${GOOS} GOARCH=${GOARCH} go build -ldflags="-s -w" -o $BINARY_FOLDER/$BINARY_NAME .

FROM gcr.io/distroless/base-debian10

ARG BINARY_FOLDER
ARG BINARY_NAME

WORKDIR /

COPY --from=builder app/build/ build/
COPY --from=builder app/$BINARY_FOLDER/$BINARY_NAME gotcha

EXPOSE 3000
ENTRYPOINT "${BINARY_FOLDER}/${BINARY_NAME}"
ENTRYPOINT [ "/gotcha", "server"]
9 changes: 4 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,22 @@ GOARCH=amd64

build: clean
mkdir ${BINARY_FOLDER} && \
go fmt ./cmd/ ./pkg/config/ ./pkg/github/ && \
go mod tidy && \
go mod download && \
export GO111MODULE=on && \
env CGO_ENABLED=0 GOOS=${GOOS} GOARCH=${GOARCH} go build -ldflags="-s -w" -o ${BINARY_FOLDER}/${BINARY_NAME} ./cmd/main.go
env CGO_ENABLED=0 GOOS=${GOOS} GOARCH=${GOARCH} go build -ldflags="-s -w" -o ${BINARY_FOLDER}/${BINARY_NAME} .

docker_build:
docker build -t ${BINARY_NAME} .

docker_run:
docker run -p 3000:3000 ${BINARY_NAME} --name ${BINARY_NAME}
docker run -p 3000:3000 --name ${BINARY_NAME} ${BINARY_NAME}

docker_all: docker_build docker_run

run:
./${BINARY_FOLDER}/${BINARY_NAME}
./${BINARY_FOLDER}/${BINARY_NAME} server

clean:
go clean
go clean
rm -rf ${BINARY_FOLDER}/
43 changes: 0 additions & 43 deletions cmd/main.go

This file was deleted.

38 changes: 35 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,17 +1,49 @@
module github.com/diegolnasc/gotcha

go 1.17
go 1.18

require (
github.com/bradleyfalzon/ghinstallation/v2 v2.0.3
github.com/gin-gonic/gin v1.8.1
github.com/go-playground/webhooks/v6 v6.0.0-rc.1
github.com/google/go-github/v41 v41.0.0
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
github.com/spf13/cobra v1.5.0
github.com/spf13/viper v1.13.0
)

require (
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/go-playground/validator/v10 v10.10.0 // indirect
github.com/goccy/go-json v0.9.7 // indirect
github.com/golang-jwt/jwt/v4 v4.0.0 // indirect
github.com/google/go-github/v39 v39.0.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.4.1 // indirect
github.com/ugorji/go/codec v1.2.7 // indirect
golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b // indirect
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 100bd16

Please sign in to comment.