Browse Source

Fixed docker hub deployment only on non PR and master branch

dependabot/npm_and_yarn/web/prismjs-1.21.0
Max Schmitt 8 years ago
parent
commit
122191e0c8
  1. 1
      .gitignore
  2. 4
      .travis.yml
  3. 2
      static/src/About/About.js
  4. 2
      static/src/Card/Card.js
  5. 5
      static/src/Home/Home.css
  6. 4
      static/src/Home/Home.js
  7. 2
      static/src/Lookup/Lookup.js
  8. 2
      static/src/Recent/Recent.js
  9. 2
      static/src/ShareX/ShareX.js
  10. 2
      static/src/Visitors/Visitors.js
  11. 2
      static/src/util/util.js

1
.gitignore

@ -1,5 +1,6 @@
# Binaries for programs and plugins # Binaries for programs and plugins
*.exe *.exe
*.exe~
*.dll *.dll
*.so *.so
*.dylib *.dylib

4
.travis.yml

@ -12,9 +12,7 @@ script:
- make - make
- goveralls -service=travis-ci -ignore="handlers/static.go,handlers/tmpls/tmpls.go" - goveralls -service=travis-ci -ignore="handlers/static.go,handlers/tmpls/tmpls.go"
- make buildDockerImage - make buildDockerImage
- docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then make docker && docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" && docker push maxibanki/golang_url_shortener && docker push maxibanki/golang_url_shortener:arm; fi'
- docker push maxibanki/golang_url_shortener
- docker push maxibanki/golang_url_shortener:arm
deploy: deploy:
provider: bintray provider: bintray
user: maxibanki user: maxibanki

2
static/src/About/About.js

@ -65,4 +65,4 @@ export default class AboutComponent extends Component {
</Container> </Container>
) )
} }
}; }

2
static/src/Card/Card.js

@ -47,4 +47,4 @@ export default class CardComponent extends Component {
</Card.Content> </Card.Content>
</Card>) </Card>)
} }
}; }

5
static/src/Home/Home.css

@ -4,8 +4,3 @@
.react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list { .react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list {
padding: 0 0; padding: 0 0;
} }
@media only screen and (max-width: 767px) {
.FieldsMarginButtomFix {
margin-bottom: 1rem !important;
}
}

4
static/src/Home/Home.js

@ -72,7 +72,7 @@ export default class HomeComponent extends Component {
<Select options={options} placeholder='Settings' onChange={this.onSettingsChange} multiple fluid /> <Select options={options} placeholder='Settings' onChange={this.onSettingsChange} multiple fluid />
</Form.Field> </Form.Field>
</MediaQuery> </MediaQuery>
<Form.Group className="FieldsMarginButtomFix"> <Form.Group style={{ marginBottom: "1rem" }}>
{usedSettings.includes("custom") && <Form.Field error={showCustomIDError} width={16}> {usedSettings.includes("custom") && <Form.Field error={showCustomIDError} width={16}>
<Input label={window.location.origin + "/"} onChange={this.handleCustomIDChange} placeholder='my-shortened-url' /> <Input label={window.location.origin + "/"} onChange={this.handleCustomIDChange} placeholder='my-shortened-url' />
</Form.Field>} </Form.Field>}
@ -100,4 +100,4 @@ export default class HomeComponent extends Component {
</div > </div >
) )
} }
}; }

2
static/src/Lookup/Lookup.js

@ -43,4 +43,4 @@ export default class LookupComponent extends Component {
</div> </div>
) )
} }
}; }

2
static/src/Recent/Recent.js

@ -55,4 +55,4 @@ export default class RecentComponent extends Component {
</Container> </Container>
) )
} }
}; }

2
static/src/ShareX/ShareX.js

@ -82,4 +82,4 @@ export default class ShareXComponent extends Component {
</Container> </Container>
) )
} }
}; }

2
static/src/Visitors/Visitors.js

@ -64,4 +64,4 @@ export default class VisitorComponent extends Component {
</Container> </Container>
) )
} }
}; }

2
static/src/util/util.js

@ -54,4 +54,4 @@ export default class UtilHelper {
.then(res => cbSucc ? cbSucc(res) : null) .then(res => cbSucc ? cbSucc(res) : null)
.catch(e => this._reportError(e, "recent")) .catch(e => this._reportError(e, "recent"))
} }
}; }
Loading…
Cancel
Save