Fixes from review of PR25
parent
90f51f6364
commit
df129fe30e
|
@ -26,4 +26,4 @@ RUN gem update bundler
|
|||
RUN bundle install
|
||||
|
||||
# Run the app
|
||||
CMD cd $APP_HOME && bundle exec foreman start
|
||||
CMD bundle exec foreman start
|
||||
|
|
6
Rakefile
6
Rakefile
|
@ -19,9 +19,9 @@ def next_version
|
|||
end
|
||||
|
||||
task :tag do
|
||||
sh "docker tag parabuzzle/craneoperator:latest parabuzzle/craneoperator:#{next_version}"
|
||||
sh "docker tag 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/craneoperator:#{next_version}"
|
||||
sh "docker tag -f parabuzzle/craneoperator:latest parabuzzle/docker-registry-ui:latest"
|
||||
sh "docker tag -f parabuzzle/craneoperator:latest parabuzzle/docker-registry-ui:#{next_version}"
|
||||
end
|
||||
|
||||
desc "Push to Dockerhub"
|
||||
|
|
|
@ -63,7 +63,7 @@ export default class RepoConfig extends React.Component {
|
|||
<hr/>
|
||||
<div className="row">
|
||||
<div className="col-md-3">
|
||||
<b>Lables:</b>
|
||||
<b>Labels:</b>
|
||||
</div>
|
||||
<div className="col-md-9">
|
||||
{this.props.config.Labels && Object.keys(this.props.config.Labels).map((label, index) => (
|
||||
|
|
|
@ -94,14 +94,14 @@ class CraneOp < Sinatra::Base
|
|||
|
||||
def sort_versions(ary)
|
||||
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
|
||||
if versions.include?('latest')
|
||||
# Make sure 'latest' appears at the top of the list
|
||||
versions.delete('latest')
|
||||
versions.unshift('latest')
|
||||
versions.push('latest')
|
||||
end
|
||||
versions.reverse
|
||||
versions
|
||||
end
|
||||
|
||||
def registry_url
|
||||
|
|
Loading…
Reference in New Issue