parabuzzle
/
craneoperator
mirror of https://github.com/parabuzzle/craneoperator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes from review of PR25

pull/25/head
Scott Lillibridge 2017-06-02 09:50:06 -07:00
parent 90f51f6364
commit df129fe30e
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -26,4 +26,4 @@ RUN gem update bundler
RUN bundle install RUN bundle install
# Run the app # Run the app
CMD cd $APP_HOME && bundle exec foreman start CMD bundle exec foreman start

6
Rakefile
View File

@ -19,9 +19,9 @@ def next_version
end end
task :tag do task :tag do
sh "docker tag parabuzzle/craneoperator:latest parabuzzle/craneoperator:#{next_version}" sh "docker tag -f parabuzzle/craneoperator:latest parabuzzle/craneoperator:#{next_version}"
sh "docker tag parabuzzle/craneoperator:latest parabuzzle/docker-registry-ui:latest" sh "docker tag -f parabuzzle/craneoperator:latest parabuzzle/docker-registry-ui:latest"
sh "docker tag parabuzzle/craneoperator:latest parabuzzle/docker-registry-ui:#{next_version}" sh "docker tag -f parabuzzle/craneoperator:latest parabuzzle/docker-registry-ui:#{next_version}"
end end
desc "Push to Dockerhub" desc "Push to Dockerhub"

2
app/components/Repos/RepoConfig.js
View File

@ -63,7 +63,7 @@ export default class RepoConfig extends React.Component {
<hr/> <hr/>
<div className="row"> <div className="row">
<div className="col-md-3"> <div className="col-md-3">
<b>Lables:</b> <b>Labels:</b>
</div> </div>
<div className="col-md-9"> <div className="col-md-9">
{this.props.config.Labels && Object.keys(this.props.config.Labels).map((label, index) => ( {this.props.config.Labels && Object.keys(this.props.config.Labels).map((label, index) => (

6
server.rb
View File

@ -94,14 +94,14 @@ class CraneOp < Sinatra::Base
def sort_versions(ary) def sort_versions(ary)
valid_version_numbers = ary.select { |i| i if i.match(/^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-[[:alnum:]]+)?$/) } valid_version_numbers = ary.select { |i| i if i.match(/^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-[[:alnum:]]+)?$/) }
non_valid_version_numbers = (ary - valid_version_numbers).sort non_valid_version_numbers = ary - valid_version_numbers
versions = valid_version_numbers.sort_by {|v| Gem::Version.new( v.gsub(/^[a-z|A-Z|.]*/, '') ) } + non_valid_version_numbers versions = valid_version_numbers.sort_by {|v| Gem::Version.new( v.gsub(/^[a-z|A-Z|.]*/, '') ) } + non_valid_version_numbers
if versions.include?('latest') if versions.include?('latest')
# Make sure 'latest' appears at the top of the list # Make sure 'latest' appears at the top of the list
versions.delete('latest') versions.delete('latest')
versions.unshift('latest') versions.push('latest')
end end
versions.reverse versions
end end
def registry_url def registry_url