Skip to content

Commit

Permalink
minor changes to get dockerhub running
Browse files Browse the repository at this point in the history
Test committed Sep 12, 2024
1 parent 5ec26e6 commit 77d7aed
Showing 5 changed files with 8 additions and 13 deletions.
13 changes: 4 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
FROM ruby:3.2.2

# Install dependencies
RUN apt-get update -qq && apt-get install -y nodejs postgresql-client yarn
RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs yarn

# Set the working directory in the container
WORKDIR /app
@@ -16,15 +16,10 @@ RUN bundle install
# Copy the application code
COPY . ./

# Ensure the entrypoint scripts are included in the image
COPY entrypoint.sh ./entrypoint.sh
COPY sidekiq-entrypoint.sh ./sidekiq-entrypoint.sh

# Make sure the entrypoint scripts are executable
RUN chmod +x entrypoint.sh sidekiq-entrypoint.sh

# Precompile assets
RUN bundle exec rake assets:precompile
# Set a dummy SECRET_KEY_BASE for precompilation
RUN SECRET_KEY_BASE=dummy_key RAILS_ENV=production bundle exec rake assets:precompile

# Define the default command to be run in the container
# Define the default command
CMD ["bash"]
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.0-alpha
1.0.1-alpha
2 changes: 2 additions & 0 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
@@ -10,6 +10,8 @@ class ApplicationController < ActionController::Base
def check_requirements
return unless user_signed_in?

connect_first_data_source if current_user.data_sources.any? && current_user.data_sources.active.none?

# Check user settings first and redirect if necessary
if current_user.settings_incomplete? && !on_user_settings_path?
redirect_to user_settings_path, alert: 'Please complete your settings.'
2 changes: 1 addition & 1 deletion app/controllers/data_sources_controller.rb
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ class DataSourcesController < ApplicationController
before_action :set_data_source, only: %i[edit update destroy connect]

def show
redirect_to data_sources_path
#redirect_to data_sources_path
end

def new
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.8'

services:
web:
build: .

0 comments on commit 77d7aed

Please sign in to comment.