Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use garnet official image from travisci #8

Merged
merged 1 commit into from
Nov 29, 2018
Merged

Use garnet official image from travisci #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 4 additions & 20 deletions api/createConf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import (
"github.com/PaulRosset/previs/travis"
)

const pathGarnet = "/home/travis/.local/bin:/opt/pyenv/shims:/home/travis/.phpenv/shims:/home/travis/perl5/perlbrew/bin:/home/travis/.nvm/versions/node/v8.9.1/bin:/home/travis/.kiex/elixirs/elixir-1.4.5/bin:/home/travis/.kiex/bin:/home/travis/.rvm/gems/ruby-2.4.1/bin:/home/travis/.rvm/gems/ruby-2.4.1@global/bin:/home/travis/.rvm/rubies/ruby-2.4.1/bin:/home/travis/.phpenv/shims:/home/travis/gopath/bin:/home/travis/.gimme/versions/go1.7.4.linux.amd64/bin:/usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/home/travis/.gimme/versions/go1.7.4.linux.amd64/bin:/usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/home/travis/.rvm/bin:/home/travis/.phpenv/bin:/opt/pyenv/bin"

// API handles all the Docker related tasks as defined by the config.
type API struct {
config *travis.Config
Expand Down Expand Up @@ -68,30 +70,12 @@ func reflectInterface(t interface{}) reflect.Value {
}

func (api *API) writerFrom() {
var from string
images := map[string]string{
"node_js": "node",
"go": "golang",
}

if api.config.Version == nil {
fmt.Fprintf(os.Stderr, "The <from> and <version> directive is mandatory in your travis config")
os.Exit(2)
}

version := api.config.Version[0]

if platform, ok := images[api.config.Language]; ok {
from = fmt.Sprintf("FROM %+v:%+v\n", platform, version)
} else {
from = fmt.Sprintf("FROM %+v:%+v\n", api.config.Language, version)
}

from := "FROM travisci/ci-garnet:packer-1515445631-7dfb2e1\n"
api.config.DockerfileConfig = api.config.DockerfileConfig + from
}

func (api *API) writerAddConfig() {
api.config.DockerfileConfig = api.config.DockerfileConfig + "RUN apt-get update\nWORKDIR /home/app/\nCOPY ./ /home/app\n"
api.config.DockerfileConfig = api.config.DockerfileConfig + "USER travis\nENV PATH " + pathGarnet + "\nWORKDIR /home/travis/builds/\nCOPY ./ /home/travis/builds/\n"
}

func (api *API) writerRunBeforeInstall() {
Expand Down
11 changes: 0 additions & 11 deletions travis/travis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,6 @@ func configFromContent(contents []byte) (*Config, error) {
}

// Parse all values from the map for usage in the config struct
lang, err := dyno.GetString(conf, "language")
if err != nil {
return nil, fmt.Errorf("Could not parse 'language' from the travis config")
}

version, err := getSlice(conf, lang)
if err != nil {
return nil, fmt.Errorf("Could not parse '%s' from the travis config: %v", lang, err)
}

beforeInstall, err := getSlice(conf, "before_install")
if err != nil {
Expand Down Expand Up @@ -79,8 +70,6 @@ func configFromContent(contents []byte) (*Config, error) {
}

return &Config{
Language: lang,
Version: version,
BeforeInstall: beforeInstall,
Install: install,
BeforeScript: beforeScript,
Expand Down