-
-Once the Okteto Environment is ready, start your application by executing the following command in your Okteto Terminal:
-
-```console
-okteto> go run main.go
-```
-
-Your application is now ready to be tested. You can check it by browsing the application's endpoint, adding the path `/mult/3/4`. In our case, it would be the endpoint `https://damp-darkness.rberrelleza.cloud.okteto.net/mult/3/4`.
-
-> Note that Okteto creates a public HTTPS endpoint forwarding to the port 8080 of your application.
-
-Congratulations, you just deployed your first Okteto Application 🚀!
-
-## Step 4: Develop directly in the cloud
-
-Now things get more exciting. Edit the file `math/main.go` and switch the word `mult` by `times` at line 43. Save your changes. Cancel the execution of `go run main.go` from your Okteto Terminal by pressing `ctrl + c`. Run your tests to check that everything is fine with your changes:
-
-```console
-okteto> go test ./...
-```
-
-And finally rerun your application:
-
-```console
-okteto> go run main.go
-```
-
-In just seconds, your code changes are live! Check it by accessing the path `/times/3/4` of your application endpoint. No commit or push required 😎!
-
-## Step 5: Deploy your application
-
-Now that you are happy with your changes, it's time to run your updated application with the `okteto run` command. Instead of launching an Okteto Environment and synchronizing your files, the `okteto run` command automatically deploys a container into your Okteto Space.
-
-Let's build a Docker image with your latest changes. Press `ctrl + c` and `ctrl + d` in your Okteto Terminal to go back to your local terminal, and execute the following command to build your docker image and push it to [Docker Hub](https://docs.docker.com/docker-hub/repos/):
-
-```console
-$ docker build -t 
+
+ <% end %>
+
+ + <%= pluralize(@article.errors.count, "error") %> prohibited + this article from being saved: +
+-
+ <% @article.errors.full_messages.each do |msg| %>
+
- <%= msg %> + <% end %> +
+ <%= form.label :title %>
+ <%= form.text_field :title %>
+
+ <%= form.label :text %>
+ <%= form.text_area :text %>
+
+ <%= form.submit %> +
+ + <% end %> \ No newline at end of file diff --git a/ruby/app/views/articles/edit.html.erb b/ruby/app/views/articles/edit.html.erb new file mode 100644 index 0000000..498da19 --- /dev/null +++ b/ruby/app/views/articles/edit.html.erb @@ -0,0 +1,6 @@ + +Edit article
+ +<%= render 'form' %> + +<%= link_to 'Back', articles_path %> \ No newline at end of file diff --git a/ruby/app/views/articles/index.html.erb b/ruby/app/views/articles/index.html.erb new file mode 100644 index 0000000..5f32729 --- /dev/null +++ b/ruby/app/views/articles/index.html.erb @@ -0,0 +1,22 @@ + +Listing Articles
+<%= link_to 'New article', new_article_path %> +| Title | +Text | ++ | ||
|---|---|---|---|---|
| <%= article.title %> | +<%= article.text %> | +<%= link_to 'Show', article_path(article) %> | +<%= link_to 'Edit', edit_article_path(article) %> | +<%= link_to 'Destroy', article_path(article), + method: :delete, + data: { confirm: 'Are you sure?' } %> | +
New article
+ +<%= render 'form' %> + +<%= link_to 'Back', articles_path %> \ No newline at end of file diff --git a/ruby/app/views/articles/show.html.erb b/ruby/app/views/articles/show.html.erb new file mode 100644 index 0000000..e03ccc2 --- /dev/null +++ b/ruby/app/views/articles/show.html.erb @@ -0,0 +1,12 @@ ++ Title: + <%= @article.title %> +
+ ++ Text: + <%= @article.text %> +
+ +<%= link_to 'Edit', edit_article_path(@article) %> | +<%= link_to 'Back', articles_path %> \ No newline at end of file diff --git a/ruby/app/views/layouts/application.html.erb b/ruby/app/views/layouts/application.html.erb new file mode 100644 index 0000000..752a30d --- /dev/null +++ b/ruby/app/views/layouts/application.html.erb @@ -0,0 +1,15 @@ + + + +Hello, Okteto!
+<%= link_to 'My Blog', controller: 'articles' %> diff --git a/ruby/bin/bundle b/ruby/bin/bundle new file mode 100755 index 0000000..f19acf5 --- /dev/null +++ b/ruby/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/ruby/bin/rails b/ruby/bin/rails new file mode 100755 index 0000000..5badb2f --- /dev/null +++ b/ruby/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/ruby/bin/rake b/ruby/bin/rake new file mode 100755 index 0000000..d87d5f5 --- /dev/null +++ b/ruby/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/ruby/bin/setup b/ruby/bin/setup new file mode 100755 index 0000000..94fd4d7 --- /dev/null +++ b/ruby/bin/setup @@ -0,0 +1,36 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/ruby/bin/spring b/ruby/bin/spring new file mode 100755 index 0000000..fb2ec2e --- /dev/null +++ b/ruby/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/ruby/bin/update b/ruby/bin/update new file mode 100755 index 0000000..58bfaed --- /dev/null +++ b/ruby/bin/update @@ -0,0 +1,31 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/ruby/bin/yarn b/ruby/bin/yarn new file mode 100755 index 0000000..460dd56 --- /dev/null +++ b/ruby/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + exec "yarnpkg", *ARGV + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end diff --git a/ruby/config/application.rb b/ruby/config/application.rb new file mode 100644 index 0000000..9e1e20d --- /dev/null +++ b/ruby/config/application.rb @@ -0,0 +1,19 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module Blog + class Application < Rails::Application + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + end +end diff --git a/ruby/config/boot.rb b/ruby/config/boot.rb new file mode 100644 index 0000000..b9e460c --- /dev/null +++ b/ruby/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/ruby/config/cable.yml b/ruby/config/cable.yml new file mode 100644 index 0000000..f75b4dd --- /dev/null +++ b/ruby/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: blog_production diff --git a/ruby/config/credentials.yml.enc b/ruby/config/credentials.yml.enc new file mode 100644 index 0000000..924f75b --- /dev/null +++ b/ruby/config/credentials.yml.enc @@ -0,0 +1 @@ +kYWBWC64t93cuqfSU1SWFaaox8b0MpJArBTnQ5O9pajHacori5FXgP1D2bZjuiee6qQ8Z+Rfquj7iSSx1JH+3U5IVAr+Y+xXGEPR9UflvS7iuNc8bk8mbNNXw9oMrIAgld1Vd0q7a6qNhhmmGPU8CCFkyOoUqX5Yzz2LDLnaF1oGWGT6dsrrpeqDClSMQCnUCL/i/tF9gVZWUKo6ny5wCw65Yc2ZrI74rP2uzUppwTr82q724TjyLigiGa+X62rIi0q9lyfd17RQ3EVDl7tBWFwsULF2tSt1xh9Ay5iKoCbAWuybSM67RJGxVqjmJn2epqFaaipeB7VPnpsLcXERAgqjxQ49cEpMzQMyvyFb17z1178PIjHgM+9favTZcpzkiSNdHAw+vqgsZkLz6VkFY1zMobscDgA60RMi--93DL+hSJ8ze7stBN--rOEY4YDmYA8iF9FZLSDWCQ== \ No newline at end of file diff --git a/ruby/config/database.yml b/ruby/config/database.yml new file mode 100644 index 0000000..0d02f24 --- /dev/null +++ b/ruby/config/database.yml @@ -0,0 +1,25 @@ +# SQLite version 3.x +# gem install sqlite3 +# +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem 'sqlite3' +# +default: &default + adapter: sqlite3 + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + timeout: 5000 + +development: + <<: *default + database: db/development.sqlite3 + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: db/test.sqlite3 + +production: + <<: *default + database: db/production.sqlite3 diff --git a/ruby/config/environment.rb b/ruby/config/environment.rb new file mode 100644 index 0000000..426333b --- /dev/null +++ b/ruby/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/ruby/config/environments/development.rb b/ruby/config/environments/development.rb new file mode 100644 index 0000000..1311e3e --- /dev/null +++ b/ruby/config/environments/development.rb @@ -0,0 +1,61 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/ruby/config/environments/production.rb b/ruby/config/environments/production.rb new file mode 100644 index 0000000..4d84c97 --- /dev/null +++ b/ruby/config/environments/production.rb @@ -0,0 +1,94 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "blog_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/ruby/config/environments/test.rb b/ruby/config/environments/test.rb new file mode 100644 index 0000000..0a38fd3 --- /dev/null +++ b/ruby/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/ruby/config/initializers/application_controller_renderer.rb b/ruby/config/initializers/application_controller_renderer.rb new file mode 100644 index 0000000..89d2efa --- /dev/null +++ b/ruby/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/ruby/config/initializers/assets.rb b/ruby/config/initializers/assets.rb new file mode 100644 index 0000000..4b828e8 --- /dev/null +++ b/ruby/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/ruby/config/initializers/backtrace_silencers.rb b/ruby/config/initializers/backtrace_silencers.rb new file mode 100644 index 0000000..59385cd --- /dev/null +++ b/ruby/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/ruby/config/initializers/content_security_policy.rb b/ruby/config/initializers/content_security_policy.rb new file mode 100644 index 0000000..d3bcaa5 --- /dev/null +++ b/ruby/config/initializers/content_security_policy.rb @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff --git a/ruby/config/initializers/cookies_serializer.rb b/ruby/config/initializers/cookies_serializer.rb new file mode 100644 index 0000000..5a6a32d --- /dev/null +++ b/ruby/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/ruby/config/initializers/filter_parameter_logging.rb b/ruby/config/initializers/filter_parameter_logging.rb new file mode 100644 index 0000000..4a994e1 --- /dev/null +++ b/ruby/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/ruby/config/initializers/inflections.rb b/ruby/config/initializers/inflections.rb new file mode 100644 index 0000000..ac033bf --- /dev/null +++ b/ruby/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/ruby/config/initializers/mime_types.rb b/ruby/config/initializers/mime_types.rb new file mode 100644 index 0000000..dc18996 --- /dev/null +++ b/ruby/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/ruby/config/initializers/wrap_parameters.rb b/ruby/config/initializers/wrap_parameters.rb new file mode 100644 index 0000000..bbfc396 --- /dev/null +++ b/ruby/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/ruby/config/locales/en.yml b/ruby/config/locales/en.yml new file mode 100644 index 0000000..decc5a8 --- /dev/null +++ b/ruby/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/ruby/config/puma.rb b/ruby/config/puma.rb new file mode 100644 index 0000000..a5eccf8 --- /dev/null +++ b/ruby/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/ruby/config/routes.rb b/ruby/config/routes.rb new file mode 100644 index 0000000..0841dad --- /dev/null +++ b/ruby/config/routes.rb @@ -0,0 +1,7 @@ +Rails.application.routes.draw do + get 'welcome/index' + + resources :articles + + root 'welcome#index' +end diff --git a/ruby/config/spring.rb b/ruby/config/spring.rb new file mode 100644 index 0000000..9fa7863 --- /dev/null +++ b/ruby/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/ruby/config/storage.yml b/ruby/config/storage.yml new file mode 100644 index 0000000..d32f76e --- /dev/null +++ b/ruby/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/ruby/db/migrate/20190129035246_create_articles.rb b/ruby/db/migrate/20190129035246_create_articles.rb new file mode 100644 index 0000000..811b24b --- /dev/null +++ b/ruby/db/migrate/20190129035246_create_articles.rb @@ -0,0 +1,10 @@ +class CreateArticles < ActiveRecord::Migration[5.2] + def change + create_table :articles do |t| + t.string :title + t.text :text + + t.timestamps + end + end +end diff --git a/ruby/db/schema.rb b/ruby/db/schema.rb new file mode 100644 index 0000000..33ff23e --- /dev/null +++ b/ruby/db/schema.rb @@ -0,0 +1,22 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_01_29_035246) do + + create_table "articles", force: :cascade do |t| + t.string "title" + t.text "text" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/ruby/db/seeds.rb b/ruby/db/seeds.rb new file mode 100644 index 0000000..1beea2a --- /dev/null +++ b/ruby/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) diff --git a/ruby/lib/assets/.keep b/ruby/lib/assets/.keep new file mode 100644 index 0000000..e69de29 diff --git a/ruby/lib/tasks/.keep b/ruby/lib/tasks/.keep new file mode 100644 index 0000000..e69de29 diff --git a/ruby/log/.keep b/ruby/log/.keep new file mode 100644 index 0000000..e69de29 diff --git a/ruby/manifests/deployment.yaml b/ruby/manifests/deployment.yaml new file mode 100644 index 0000000..6699d2b --- /dev/null +++ b/ruby/manifests/deployment.yaml @@ -0,0 +1,19 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: blog + annotations: + dev.okteto.com/auto-ingress: "true" +spec: + replicas: 1 + selector: + matchLabels: + app: blog + template: + metadata: + labels: + app: blog + spec: + containers: + - image: okteto/blog:latest + name: blog \ No newline at end of file diff --git a/ruby/manifests/service.yaml b/ruby/manifests/service.yaml new file mode 100644 index 0000000..8ea7e1c --- /dev/null +++ b/ruby/manifests/service.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: Service +metadata: + name: blog + annotations: + dev.okteto.com/auto-ingress: "true" +spec: + type: ClusterIP + ports: + - name: "blog" + port: 8080 + selector: + app: blog diff --git a/ruby/public/404.html b/ruby/public/404.html new file mode 100644 index 0000000..2be3af2 --- /dev/null +++ b/ruby/public/404.html @@ -0,0 +1,67 @@ + + + +
+
+
+
diff --git a/ruby/public/422.html b/ruby/public/422.html
new file mode 100644
index 0000000..c08eac0
--- /dev/null
+++ b/ruby/public/422.html
@@ -0,0 +1,67 @@
+
+
+
+
+
+ The page you were looking for doesn't exist.
+You may have mistyped the address or the page may have moved.
+If you are the application owner check the logs for more information.
+
+
+
+
diff --git a/ruby/public/500.html b/ruby/public/500.html
new file mode 100644
index 0000000..78a030a
--- /dev/null
+++ b/ruby/public/500.html
@@ -0,0 +1,66 @@
+
+
+
+
+
+ The change you wanted was rejected.
+Maybe you tried to change something you didn't have access to.
+If you are the application owner check the logs for more information.
+
+
+
+
diff --git a/ruby/public/apple-touch-icon-precomposed.png b/ruby/public/apple-touch-icon-precomposed.png
new file mode 100644
index 0000000..e69de29
diff --git a/ruby/public/apple-touch-icon.png b/ruby/public/apple-touch-icon.png
new file mode 100644
index 0000000..e69de29
diff --git a/ruby/public/favicon.ico b/ruby/public/favicon.ico
new file mode 100644
index 0000000..e69de29
diff --git a/ruby/public/robots.txt b/ruby/public/robots.txt
new file mode 100644
index 0000000..37b576a
--- /dev/null
+++ b/ruby/public/robots.txt
@@ -0,0 +1 @@
+# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
diff --git a/ruby/storage/.keep b/ruby/storage/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/ruby/test/application_system_test_case.rb b/ruby/test/application_system_test_case.rb
new file mode 100644
index 0000000..d19212a
--- /dev/null
+++ b/ruby/test/application_system_test_case.rb
@@ -0,0 +1,5 @@
+require "test_helper"
+
+class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+ driven_by :selenium, using: :chrome, screen_size: [1400, 1400]
+end
diff --git a/ruby/test/controllers/.keep b/ruby/test/controllers/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/ruby/test/controllers/articles_controller_test.rb b/ruby/test/controllers/articles_controller_test.rb
new file mode 100644
index 0000000..aae3248
--- /dev/null
+++ b/ruby/test/controllers/articles_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ArticlesControllerTest < ActionDispatch::IntegrationTest
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/ruby/test/controllers/welcome_controller_test.rb b/ruby/test/controllers/welcome_controller_test.rb
new file mode 100644
index 0000000..a95e43a
--- /dev/null
+++ b/ruby/test/controllers/welcome_controller_test.rb
@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class WelcomeControllerTest < ActionDispatch::IntegrationTest
+ test "should get index" do
+ get welcome_index_url
+ assert_response :success
+ end
+
+end
diff --git a/ruby/test/fixtures/.keep b/ruby/test/fixtures/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/ruby/test/fixtures/articles.yml b/ruby/test/fixtures/articles.yml
new file mode 100644
index 0000000..46b01c3
--- /dev/null
+++ b/ruby/test/fixtures/articles.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ title: MyString
+ text: MyText
+
+two:
+ title: MyString
+ text: MyText
diff --git a/ruby/test/fixtures/files/.keep b/ruby/test/fixtures/files/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/ruby/test/helpers/.keep b/ruby/test/helpers/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/ruby/test/integration/.keep b/ruby/test/integration/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/ruby/test/mailers/.keep b/ruby/test/mailers/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/ruby/test/models/.keep b/ruby/test/models/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/ruby/test/models/article_test.rb b/ruby/test/models/article_test.rb
new file mode 100644
index 0000000..11c8abe
--- /dev/null
+++ b/ruby/test/models/article_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ArticleTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/ruby/test/system/.keep b/ruby/test/system/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/ruby/test/test_helper.rb b/ruby/test/test_helper.rb
new file mode 100644
index 0000000..3ab84e3
--- /dev/null
+++ b/ruby/test/test_helper.rb
@@ -0,0 +1,10 @@
+ENV['RAILS_ENV'] ||= 'test'
+require_relative '../config/environment'
+require 'rails/test_help'
+
+class ActiveSupport::TestCase
+ # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
+ fixtures :all
+
+ # Add more helper methods to be used by all tests here...
+end
diff --git a/ruby/tmp/.keep b/ruby/tmp/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/ruby/vendor/.keep b/ruby/vendor/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/vote/.gitignore b/vote/.gitignore
deleted file mode 100644
index a08fb88..0000000
--- a/vote/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-okteto.yml
-.stignore
diff --git a/vote/Dockerfile b/vote/Dockerfile
deleted file mode 100644
index 4a71d27..0000000
--- a/vote/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Using official python runtime base image
-FROM python:3-alpine
-
-# Set the application directory
-WORKDIR /usr/src/app
-
-# Install our requirements.txt
-ADD requirements.txt requirements.txt
-RUN pip install -r requirements.txt
-
-# Copy our code from the current folder to /app inside the container
-ADD . /usr/src/app
-
-# Make port 8080 available for links and/or publish
-EXPOSE 8080
-
-# Define our command to be run when launching the container
-CMD ["python", "app.py"]
diff --git a/vote/README.md b/vote/README.md
deleted file mode 100644
index d6fda35..0000000
--- a/vote/README.md
+++ /dev/null
@@ -1,115 +0,0 @@
-# Voting App
-
-This example shows how to leverage [Okteto](https://cloud.okteto.com) to develop a python app directly in the cloud.
-
-## Step 1: Install the Okteto CLI
-
-Install the Okteto CLI by running the following command in your local terminal:
-
-MacOS/Linux
-
-```console
-curl https://get.okteto.com -sSfL | sh
-```
-
-Windows
-
-```console
-wget https://downloads.okteto.com/cli/okteto-Windows-x86_64 -OutFile c:\windows\system32\okteto.exe
-```
-
-## Step 2: Login from the Okteto CLI
-
-```console
-$ okteto login
-```
-
-This command will give you an Okteto Space, where you can create Okteto Environments to code and collaborate.
-
-## Step 3: Create your Okteto Environment
-
-Get a local version of the sample application by executing the following commands in your local terminal:
-
-```console
-$ git clone https://github.com/okteto/cloud-samples
-$ cd cloud-samples/vote
-```
-
-You now have a functioning git repository that contains a simple python 3 application and a `requirements.txt`, which is used by Python’s dependency manager, `pip`.
-
-The sample application uses redis. Run the following command to deploy an Okteto Redis Database into your Okteto Space:
-
-```console
-$ okteto database redis
-```
-
-Now start your Okteto Environment by running the following command:
-
-```console
-$ okteto up
-```
-
-The `okteto up` command will automatically start an Okteto Environment. It will also start a file synchronization service to keep your changes up to date between your local filesystem and your Okteto Environment.
-
-
+
+ We're sorry, but something went wrong.
+If you are the application owner check the logs for more information.
+
-
-Once the Okteto Environment is ready, start your application by executing the following commands in your Okteto Terminal:
-
-```console
-okteto> pip install -r requirements.txt
-okteto> python app.py
-```
-
-Your application is now ready to be tested. You can check it by logging into [Okteto](https://cloud.okteto.com) and clicking in the application's endpoint.
-
-> Note that Okteto creates a public HTTPS endpoint forwarding to the port 8080 of your application.
-
-
-
-Congratulations, you just deployed your first Okteto Application 🚀!
-
-## Step 4: Develop directly in the cloud
-
-Now things get more exciting. Open `vote/app.py` in your favorite IDE and modify the `getOptions` function with the following code, and save your file:
-
-```python
-def getOptions():
- optionA = 'Otters'
- optionB = 'Dogs'
- return optionA, optionB
-```
-
-Go back to the Okteto Terminal and notice that flask already detected the code changes and reloaded your application.
-
-```console
-...
- * Detected change in '/usr/src/app/app.py', reloading
- * Restarting with stat
- * Debugger is active!
- * Debugger PIN: 778-756-428
-```
-
-Go back to the browser, and reload the page. Notice how your changes are instantly applied. No commit or push required 😎!
-
-## Step 5: Deploy your application
-
-Now that you are happy with your changes, it's time to run your updated application with the `okteto run` command. Instead of launching an Okteto Environment and synchronizing your files, the `okteto run` command automatically deploys a container into your Okteto Space.
-
-Let's build a Docker image with your latest changes. Press `ctrl + c` and `ctrl + d` in your Okteto Terminal to go back to your local terminal, and execute the following command to build your docker image and push it to [Docker Hub](https://docs.docker.com/docker-hub/repos/):
-
-```console
-$ docker build -t
-
-
-
-
-
diff --git a/vscode-ssh/Dockerfile b/vscode/Dockerfile
similarity index 86%
rename from vscode-ssh/Dockerfile
rename to vscode/Dockerfile
index 20f40ce..4e2f9f9 100644
--- a/vscode-ssh/Dockerfile
+++ b/vscode/Dockerfile
@@ -2,14 +2,14 @@
FROM python:stretch as app
# Install the application
-WORKDIR /usr/src/app
+WORKDIR /src
ADD requirements.txt requirements.txt
RUN pip install -r requirements.txt
-ADD . /usr/src/app
+ADD . /src
EXPOSE 8080
CMD ["python", "app.py"]
-FROM app as ssh
+FROM app
# Configure SSH server
RUN apt-get update && apt-get install -y openssh-server
diff --git a/vscode-ssh/README.md b/vscode/README.md
similarity index 52%
rename from vscode-ssh/README.md
rename to vscode/README.md
index 2e51fef..cb22239 100644
--- a/vscode-ssh/README.md
+++ b/vscode/README.md
@@ -18,56 +18,27 @@ Windows
wget https://downloads.okteto.com/cli/okteto-Windows-x86_64 -OutFile c:\windows\system32\okteto.exe
```
-## Step 2: Login from the Okteto CLI
+This example works in any Kubernetes cluster (Okteto reads your local Kubernetes credentials), but we recommend to use https://cloud.okteto.com to follow this guide.
-```console
-$ okteto login
-```
-
-This command will give you an Okteto Space, where you can create Okteto Environments to code and collaborate.
-Under the hood, an Okteto Space is mapped to a Kubernetes Namespace.
-
-## Step 3: Configure kubectl to point to Okteto
-
-> If you don´t have `kubectl` installed, follow this [guide](https://kubernetes.io/docs/tasks/tools/install-kubectl/).
-
-Okteto gives you `kubectl` credentials configured to work in our multi-tenant cluster. These credentials have network policies, quotas, pod security policies, admission webhooks, roles, role bindings and limit ranges to control what you can do in your Okteto Space. In order to download the credentials, execute:
-
-```console
-$ okteto kubeconfig
- ✓ Kubeconfig stored at $HOME/.okteto/.kubeconfig
- i Configure kubectl to work on your Okteto Space by running:
- export KUBECONFIG=$HOME/.okteto/.kubeconfig
-```
-and now execute:
-
-```console
-$ export KUBECONFIG=$HOME/.okteto/.kubeconfig
-```
-
-## Step 4: Deploy the Voting App
+## Step 2: Deploy the Voting App
Clone this repository and move to this example folder.
```console
-git clone https://github.com/okteto/cloud-samples
-cd cloud-samples/vscode-ssh
+git clone https://github.com/okteto/samples
+cd samples/vscode
```
-Edit the file `manifests\ingress.yaml` and substitute `cindy` by your Github ID in lines 9 and 18.
-
-> Okteto only let you create ingress rules for domains ending in `-[githubid].cloud.okteto.net`.
-
-Save and run the Voting App by executing:
+Run the Voting App by executing:
```console
kubectl apply -f manifests
```
-Wait for one or two minutes until the application is running. You can access it at https://vote-[githubid].cloud.okteto.net.
+Wait for one or two minutes until the application is running. You can access it at https://localhost:8080.
-## Step 5: Develop as a Cloud Native Developer
+## Step 3: Develop as a Cloud Native Developer
Now start your Okteto Environment by running the following command:
@@ -79,7 +50,7 @@ The `okteto up` command will automatically start an Okteto Environment. It will
Everything is ready now to set up your VS Code Remote SSH extension to point to `localhost:22000` (follow this [link](https://code.visualstudio.com/docs/remote/ssh#_connect-to-a-remote-host) if you are not familiar with this process). In order to indicate the remote server in VS Code, write `-p 22000 root@localhost` as the Remote Host.
-From VS Code, open the remote folder `/usr/src/app`, then open a terminal and execute the following command:
+From VS Code, open the remote folder `/src`, then open a terminal and execute the following command:
```console
$ python app.py
@@ -91,7 +62,7 @@ $ python app.py
* Debugger PIN: 117-959-944
```
-This command will start the python service on your remote development environment. You can verify that everything is up and running by going to your service's endpoint at https://vote-[githubid].cloud.okteto.net.
+This command will start the python service on your remote development environment. You can verify that everything is up and running by going to your service's endpoint at https://localhost:8080.
Now let's make a code change. Open `app.py` in VS Code and modify the `getOptions` function with the code below:
@@ -106,8 +77,10 @@ Go to the browser again and reload the page. Your changes were applied instantly
> We recommend to keep Git extensions locally. This way they use your local keys and you don´t need to install them remotely.
-## Conclusions
+## Step 5: Cleanup
-We explained the advantages of developing directly in Kubernetes while keeping the same developer experience than working on a local machine. Working on the Cloud is always better. You don't work on your spreadsheets and listen to media files locally, do you? Stop dealing with local environments and become a Cloud Native Developer today 😎!
+Cancel the `okteto up` command by pressing `ctrl + c` and run the following commands to remove the resources created by this guide:
-> Interested in improving your Kubernetes and Docker development workflows? [Contact us](mailto:sales@okteto.com?Subject=Improve%20my%20development%20workflow) to see how to install our platform in your own infrastructure.
+```console
+kubectl delete -f manifests
+```
diff --git a/cloud-run/app.py b/vscode/app.py
similarity index 100%
rename from cloud-run/app.py
rename to vscode/app.py
diff --git a/vscode-ssh/manifests/deployment.yaml b/vscode/manifests/deployment.yaml
similarity index 74%
rename from vscode-ssh/manifests/deployment.yaml
rename to vscode/manifests/deployment.yaml
index 2603cd5..99d816e 100644
--- a/vscode-ssh/manifests/deployment.yaml
+++ b/vscode/manifests/deployment.yaml
@@ -2,6 +2,8 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: vote
+ annotations:
+ dev.okteto.com/auto-ingress: "true"
spec:
replicas: 1
selector:
@@ -13,7 +15,7 @@ spec:
app: vote
spec:
containers:
- - image: okteto/vote:1.3
+ - image: okteto/vote:latest
name: vote
volumeMounts:
- name: ssh
diff --git a/vscode-ssh/manifests/service.yaml b/vscode/manifests/service.yaml
similarity index 72%
rename from vscode-ssh/manifests/service.yaml
rename to vscode/manifests/service.yaml
index 29e4bb1..981420c 100644
--- a/vscode-ssh/manifests/service.yaml
+++ b/vscode/manifests/service.yaml
@@ -2,6 +2,8 @@ apiVersion: v1
kind: Service
metadata:
name: vote
+ annotations:
+ dev.okteto.com/auto-ingress: "true"
spec:
type: ClusterIP
ports:
diff --git a/vscode-ssh/okteto.yml b/vscode/okteto.yml
similarity index 68%
rename from vscode-ssh/okteto.yml
rename to vscode/okteto.yml
index 4479b85..ebff372 100644
--- a/vscode-ssh/okteto.yml
+++ b/vscode/okteto.yml
@@ -1,6 +1,7 @@
name: vote
-image: okteto/vote-ssh:dev
+image: okteto/vote:ssh
+workdir: /src
command: [ "sh", "-c", "cp /etc/ssh-key/* /root/.ssh && /usr/sbin/sshd -D" ]
-workdir: /usr/src/app
forward:
+ - 8080:8080
- 22000:22
diff --git a/vscode-ssh/requirements.txt b/vscode/requirements.txt
similarity index 100%
rename from vscode-ssh/requirements.txt
rename to vscode/requirements.txt
diff --git a/vscode-ssh/static/stylesheets/style.css b/vscode/static/stylesheets/style.css
similarity index 100%
rename from vscode-ssh/static/stylesheets/style.css
rename to vscode/static/stylesheets/style.css
diff --git a/vote/templates/index.html b/vscode/templates/index.html
similarity index 100%
rename from vote/templates/index.html
rename to vscode/templates/index.html
-
- {{option_a}} vs {{option_b}}!
- -{{votes_a}} vs {{votes_b}}
-
-
- Processed by {{hostname}}
-