From fe7443daaa45e912c75f7572f3d2dbf446d631b8 Mon Sep 17 00:00:00 2001 From: deranjer Date: Sun, 8 Aug 2021 22:42:40 -0400 Subject: [PATCH] just need to figure out config files, everything else appears to work --- .gitignore | 3 +++ .goreleaser.yml | 54 ++++++++++++++++++++------------------ Dockerfile | 13 +++++++-- Taskfile.yml | 3 ++- config/default_config.yaml | 2 ++ go.mod | 4 +-- go.sum | 27 ------------------- 7 files changed, 48 insertions(+), 58 deletions(-) create mode 100644 config/default_config.yaml diff --git a/.gitignore b/.gitignore index 39cb81e..e827bc9 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,6 @@ frontend/build *npm-debug.log* *yarn-debug.log* *yarn-error.log*dist/ + +#goreleaser +dist/ diff --git a/.goreleaser.yml b/.goreleaser.yml index c4169e9..17c50fe 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -2,11 +2,14 @@ # Make sure to check the documentation at http://goreleaser.com env_files: - github_token: .env + #github_token: .env gitea_token: .env project_name: goInventorize +env: + - P_NAME_LOWER=goinventorize + before: hooks: # You may remove this if you don't use go modules. @@ -15,31 +18,19 @@ before: - go generate ./... builds: - - id: "linux-amd64" - main: ./main - binary: goInventorize + main: main.go + binary: "{{.ProjectName}}-{{.Os}}-{{.Arch}}" env: - CGO_ENABLED=0 + - PORT=3000 goos: - linux - goarch: - - amd64 - - - id: "windows-amd64" - env: - - CGO_ENABLED=0 - goos: - windows - goarch: - - amd64 - - - id: "darwin-amd64" - env: - - CGO_ENABLED=0 - goos: - darwin goarch: - amd64 + # - arm + # - arm64 archives: - replacements: @@ -52,15 +43,17 @@ dockers: - goos: linux goarch: amd64 - ids: - - "linux-amd64" + # ids: + # - "linux-amd64" # Templates of the Docker image names. + extra_files: + - README.md image_templates: - - "deranjer/goInventorize:latest" - - "deranjer/goInventorize:{{ .Tag }}" - - "deranjer/goInventorize:{{ .Tag }}-{{ .Env.GO_VERSION }}" - - "deranjer/goInventorize:v{{ .Major }}" - - "ghcr.io/deranjer/goInventorize:latest" + - "deranjer/{{ .Env.P_NAME_LOWER }}:latest" + - "deranjer/{{ .Env.P_NAME_LOWER }}:{{ .Tag }}" + - "deranjer/{{ .Env.P_NAME_LOWER }}:{{ .Tag }}-{{ .Env.GO_VERSION }}" + - "deranjer/{{ .Env.P_NAME_LOWER }}:v{{ .Major }}" + - "ghcr.io/deranjer/{{ .Env.P_NAME_LOWER }}:latest" dockerfile: Dockerfile @@ -72,6 +65,17 @@ dockers: - "--label=org.opencontainers.image.version={{.Version}}" - "--platform=linux/amd64" +release: + gitea: + owner: deranjer + name: "{{.ProjectName}}" + draft: true + prerelease: auto + +gitea_urls: + api: https://gitea.derajnet.duckdns.org/api/v1/ + download: https://gitea.derajnet.duckdns.org + checksum: name_template: 'checksums.txt' snapshot: diff --git a/Dockerfile b/Dockerfile index abefcb5..a3ad4d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,12 @@ FROM scratch -ENTRYPOINT ["/mybin"] -COPY mybin / \ No newline at end of file +#FROM alpine + +# Copy in the binary and settings file +COPY goInventorize-linux-amd64 / + +ENV PORT=3000 +# Export necessary port. +EXPOSE 3000 + +# Command to run when starting the container. +ENTRYPOINT ["/goInventorize-linux-amd64"] \ No newline at end of file diff --git a/Taskfile.yml b/Taskfile.yml index c2c6a49..f9e9ad3 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -5,6 +5,7 @@ version: '3' env: CURRENT_RELEASE: 0.1.0 RELEASE_MSG: "First official release of the project" + GO_VERSION: 1.16.3 tasks: build: @@ -49,7 +50,7 @@ tasks: Requires the GITHUB_TOKEN env variable to release to github Releases an unversioned snapshot to github cmds: - - goreleaser release --snapshot + - goreleaser release --snapshot --rm-dist --debug run-frontend: dir: diff --git a/config/default_config.yaml b/config/default_config.yaml new file mode 100644 index 0000000..e20feab --- /dev/null +++ b/config/default_config.yaml @@ -0,0 +1,2 @@ +serverConfig: + port: 3000 \ No newline at end of file diff --git a/go.mod b/go.mod index f7abd83..bd5e5ee 100644 --- a/go.mod +++ b/go.mod @@ -4,10 +4,8 @@ go 1.16 require ( github.com/andybalholm/brotli v1.0.3 // indirect - github.com/asdine/storm/v3 v3.2.1 // indirect - github.com/gofiber/fiber/v2 v2.15.0 // indirect + github.com/gofiber/fiber/v2 v2.15.0 github.com/klauspost/compress v1.13.1 // indirect github.com/valyala/fasthttp v1.28.0 // indirect - go.etcd.io/bbolt v1.3.6 // indirect golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect ) diff --git a/go.sum b/go.sum index 1af9cfd..052185d 100644 --- a/go.sum +++ b/go.sum @@ -1,25 +1,12 @@ -github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= -github.com/Sereal/Sereal v0.0.0-20190618215532-0b8ac451a863/go.mod h1:D0JMgToj/WdxCgd30Kc1UcA9E+WdZoJqeVOuYW7iTBM= github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.3 h1:fpcw+r1N1h0Poc1F/pHbW40cUm/lMEQslZtCkBQ0UnM= github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/asdine/storm/v3 v3.2.1 h1:I5AqhkPK6nBZ/qJXySdI7ot5BlXSZ7qvDY1zAn5ZJac= -github.com/asdine/storm/v3 v3.2.1/go.mod h1:LEpXwGt4pIqrE/XcTvCnZHT5MgZCV6Ub9q7yQzOFWr0= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gofiber/fiber/v2 v2.15.0 h1:yd+o1t6/hjkmjZxz4FJlgHAKBIu1w1PnRL3VB67KMHM= github.com/gofiber/fiber/v2 v2.15.0/go.mod h1:iftruuHGkRYGEXVISmdD7HTYWyfS2Bh+Dkfq4n/1Owg= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/klauspost/compress v1.12.2/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.13.1 h1:wXr2uRxZTJXHLly6qhJabee5JqIhTRoLBhDOA74hDEQ= github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.26.0/go.mod h1:cmWIqlu99AO/RKcp1HWaViTqc57FswJOfYYdPJBl8BA= @@ -27,29 +14,15 @@ github.com/valyala/fasthttp v1.28.0 h1:ruVmTmZaBR5i67NqnjvvH5gEv0zwHfWtbjoyW98ih github.com/valyala/fasthttp v1.28.0/go.mod h1:cmWIqlu99AO/RKcp1HWaViTqc57FswJOfYYdPJBl8BA= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= -github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= -go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= -go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20191105084925-a882066a44e0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=