From ea48ce478e5ab1d2b42db44781a7037b0808977f Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 12 Mar 2014 22:19:25 +0530 Subject: [PATCH] renamed resources directory to assets --- Dockerfile | 2 +- {resources => assets}/.bash_aliases | 0 {resources => assets}/.vimrc | 0 {resources => assets}/gitlab | 0 {resources => assets}/setup/config.tar.bz2 | Bin .../setup/config/gitlab-shell/config.yml | 0 .../setup/config/gitlabhq/database.yml | 0 .../setup/config/gitlabhq/gitlab.yml | 0 .../setup/config/gitlabhq/rack_attack.rb | 0 .../setup/config/gitlabhq/resque.yml | 0 .../setup/config/gitlabhq/sidekiq.yml | 0 .../setup/config/gitlabhq/smtp_settings.rb | 0 .../setup/config/gitlabhq/unicorn.rb | 0 {resources => assets}/setup/config/nginx/gitlab | 0 {resources => assets}/setup/install | 0 15 files changed, 1 insertion(+), 1 deletion(-) rename {resources => assets}/.bash_aliases (100%) rename {resources => assets}/.vimrc (100%) rename {resources => assets}/gitlab (100%) rename {resources => assets}/setup/config.tar.bz2 (100%) rename {resources => assets}/setup/config/gitlab-shell/config.yml (100%) rename {resources => assets}/setup/config/gitlabhq/database.yml (100%) rename {resources => assets}/setup/config/gitlabhq/gitlab.yml (100%) rename {resources => assets}/setup/config/gitlabhq/rack_attack.rb (100%) rename {resources => assets}/setup/config/gitlabhq/resque.yml (100%) rename {resources => assets}/setup/config/gitlabhq/sidekiq.yml (100%) rename {resources => assets}/setup/config/gitlabhq/smtp_settings.rb (100%) rename {resources => assets}/setup/config/gitlabhq/unicorn.rb (100%) rename {resources => assets}/setup/config/nginx/gitlab (100%) rename {resources => assets}/setup/install (100%) diff --git a/Dockerfile b/Dockerfile index 051bd4e1..7fd6e887 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN wget ftp://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p353.tar.gz -O - | tar cd /tmp && rm -rf /tmp/ruby-2.0.0-p353 && \ gem install --no-ri --no-rdoc bundler -ADD resources/ /gitlab/ +ADD assets/ /gitlab/ RUN mv /gitlab/.vimrc /gitlab/.bash_aliases /root/ RUN chmod 755 /gitlab/gitlab /gitlab/setup/install && /gitlab/setup/install diff --git a/resources/.bash_aliases b/assets/.bash_aliases similarity index 100% rename from resources/.bash_aliases rename to assets/.bash_aliases diff --git a/resources/.vimrc b/assets/.vimrc similarity index 100% rename from resources/.vimrc rename to assets/.vimrc diff --git a/resources/gitlab b/assets/gitlab similarity index 100% rename from resources/gitlab rename to assets/gitlab diff --git a/resources/setup/config.tar.bz2 b/assets/setup/config.tar.bz2 similarity index 100% rename from resources/setup/config.tar.bz2 rename to assets/setup/config.tar.bz2 diff --git a/resources/setup/config/gitlab-shell/config.yml b/assets/setup/config/gitlab-shell/config.yml similarity index 100% rename from resources/setup/config/gitlab-shell/config.yml rename to assets/setup/config/gitlab-shell/config.yml diff --git a/resources/setup/config/gitlabhq/database.yml b/assets/setup/config/gitlabhq/database.yml similarity index 100% rename from resources/setup/config/gitlabhq/database.yml rename to assets/setup/config/gitlabhq/database.yml diff --git a/resources/setup/config/gitlabhq/gitlab.yml b/assets/setup/config/gitlabhq/gitlab.yml similarity index 100% rename from resources/setup/config/gitlabhq/gitlab.yml rename to assets/setup/config/gitlabhq/gitlab.yml diff --git a/resources/setup/config/gitlabhq/rack_attack.rb b/assets/setup/config/gitlabhq/rack_attack.rb similarity index 100% rename from resources/setup/config/gitlabhq/rack_attack.rb rename to assets/setup/config/gitlabhq/rack_attack.rb diff --git a/resources/setup/config/gitlabhq/resque.yml b/assets/setup/config/gitlabhq/resque.yml similarity index 100% rename from resources/setup/config/gitlabhq/resque.yml rename to assets/setup/config/gitlabhq/resque.yml diff --git a/resources/setup/config/gitlabhq/sidekiq.yml b/assets/setup/config/gitlabhq/sidekiq.yml similarity index 100% rename from resources/setup/config/gitlabhq/sidekiq.yml rename to assets/setup/config/gitlabhq/sidekiq.yml diff --git a/resources/setup/config/gitlabhq/smtp_settings.rb b/assets/setup/config/gitlabhq/smtp_settings.rb similarity index 100% rename from resources/setup/config/gitlabhq/smtp_settings.rb rename to assets/setup/config/gitlabhq/smtp_settings.rb diff --git a/resources/setup/config/gitlabhq/unicorn.rb b/assets/setup/config/gitlabhq/unicorn.rb similarity index 100% rename from resources/setup/config/gitlabhq/unicorn.rb rename to assets/setup/config/gitlabhq/unicorn.rb diff --git a/resources/setup/config/nginx/gitlab b/assets/setup/config/nginx/gitlab similarity index 100% rename from resources/setup/config/nginx/gitlab rename to assets/setup/config/nginx/gitlab diff --git a/resources/setup/install b/assets/setup/install similarity index 100% rename from resources/setup/install rename to assets/setup/install