Skip to content
This repository has been archived by the owner on Feb 24, 2024. It is now read-only.

Commit

Permalink
v0.16.11 (#2014)
Browse files Browse the repository at this point in the history
* adding direct version on the docker build

* fixing plugin installation

* Fix npm's package.json permissions (#2005)

Changed created file permissions from 644 (`-w----r--`) to 0644 (`rw-r--r--`)

* Bump spf13/viper to v1.7.0 (#1999)

* bunping version

* changing version on dockerfile

* patch to fix the keywords check on new app

* removing unneeded append

Co-authored-by: Disconnect3d <[email protected]>
Co-authored-by: hackerman <[email protected]>
  • Loading branch information
3 people authored Jul 15, 2020
1 parent e9593f2 commit 6fe4db6
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.build
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ RUN npm install -g --no-progress yarn \
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.24.0

# Pulling docker binary from releases
RUN wget https://github.com/gobuffalo/buffalo/releases/download/v0.16.10/buffalo_0.16.10_Linux_x86_64.tar.gz \
&& tar -xzf buffalo_0.16.10_Linux_x86_64.tar.gz \
RUN wget https://github.com/gobuffalo/buffalo/releases/download/v0.16.11/buffalo_0.16.11_Linux_x86_64.tar.gz \
&& tar -xzf buffalo_0.16.11_Linux_x86_64.tar.gz \
&& mv buffalo $(go env GOPATH)/bin/buffalo

RUN go get github.com/gobuffalo/buffalo-pop/v2
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.slim.build
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ RUN npm i -g --no-progress yarn \
&& yarn config set yarn-offline-mirror-pruning true

# Pulling docker binary from releases
RUN wget https://github.com/gobuffalo/buffalo/releases/download/vv0.16.10/buffalo_v0.16.10_Linux_x86_64.tar.gz \
&& tar -xzf buffalo_v0.16.10_Linux_x86_64.tar.gz \
RUN wget https://github.com/gobuffalo/buffalo/releases/download/v0.16.11/buffalo_v0.16.11_Linux_x86_64.tar.gz \
&& tar -xzf buffalo_v0.16.11_Linux_x86_64.tar.gz \
&& mv buffalo $(go env GOPATH)/bin/buffalo

RUN go get github.com/gobuffalo/buffalo-pop/v2
Expand Down
13 changes: 11 additions & 2 deletions genny/newapp/core/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ func (opts *Options) Validate() error {
}

name := strings.ToLower(opts.App.Name.String())
fb := append(opts.ForbiddenNames, "buffalo", "test", "dev")
for _, n := range fb {
for _, n := range opts.ForbiddenNames {
rx, err := regexp.Compile(n)
if err != nil {
return err
Expand All @@ -82,9 +81,19 @@ func (opts *Options) Validate() error {
}
}

keywords := []string{"buffalo", "test", "dev"}
for _, kw := range keywords {
if name != kw {
continue
}

return fmt.Errorf("name %s is not allowed, try a different application name", opts.App.Name)
}

if !nameRX.MatchString(name) {
return fmt.Errorf("name %s is not allowed, application name can only contain [a-Z0-9-_]", opts.App.Name)
}

return nil
}

Expand Down
2 changes: 1 addition & 1 deletion runtime/version.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package runtime

// Version is the current version of the buffalo binary
var Version = "v0.16.10"
var Version = "v0.16.11"

0 comments on commit 6fe4db6

Please sign in to comment.