stack_car 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e8df8e8dbd70e738de0a61cd09489c72e4cd822326b237269d21ebe4dacd258
-  data.tar.gz: 11214bdf66ad316ad4feec518f0ef0e39f9e146aea500c3b7e187a67ecaa33fe
+  metadata.gz: be5319f55289a7290898afd746925c52ca00abd632f8c8bb15bc9fd9ef42b91b
+  data.tar.gz: 5fc7e21e1ff7bb056ddcdfe2fd35da741f5d0d27e9f7491ce7dee44483a2e50f
 SHA512:
-  metadata.gz: 65b81508cd79dd4fdff903820133034b4dc894eeaff69a3033e2439b9cae81f5b34e48055a83485e56f3236ea7111cc9dc24d3c8a3a8cdb8341a5b64490e070a
-  data.tar.gz: 60223a2ce56c3173e4c62b8d08e05e1d8c6c5fcd2c64027864cef6aa76857c88e3b9a9ae2d6c88cd4a229f2c858f1f1359959b849faffe129119258500b97b2c
+  metadata.gz: e911986bdbecd0848db4a0987eb631f52d0e76271c67f06761a0364332db693c25bf0f34911169dd9a2caeb907c74e095d98a6352d1fc9264cacf15dddef1cf2
+  data.tar.gz: 3a8790e739b56f07648edb147f9dd2dde7e77875c3b45ccadb342d243880ceee34a97f5e1da236d2204a65778409c26a196c74c08c87e906a7297bc81829aac6

data/lib/stack_car/cli.rb

@@ -165,7 +165,7 @@ module StackCar
     method_option :elasticsearch, default: false, type: :boolean, aliases: '-e'
     method_option :fcrepo, default: false, type: :boolean, aliases: '-f'
     method_option :helm, default: false, type: :boolean, aliases: '-h'
-    method_option :git, default: true, type: :boolean, aliases: '-g'
+    method_option :git, default: false, type: :boolean, aliases: '-g'
     method_option :heroku, default: false, type: :boolean, aliases: '-h'
     method_option :hyku, default: false, type: :boolean, aliases: '-u'
     method_option :imagemagick, default: false, type: :boolean, aliases: '-i'
@@ -214,7 +214,7 @@ module StackCar
         post_apt << "cd /opt && unzip fits-1.0.5.zip && chmod +X fits-1.0.5/fits.sh"
       end
 
-     ['.dockerignore', 'Dockerfile', 'Dockerfile.base', 'docker-compose.yml', '.gitlab-ci.yml', '.env'].each do |template_file|
+     ['.dockerignore', 'Dockerfile', 'docker-compose.yml', '.gitlab-ci.yml', '.env'].each do |template_file|
        puts template_file
         template("#{template_file}.erb", template_file)
      end
@@ -344,6 +344,7 @@ module StackCar
 
     def setup
       if File.exists?('stack_car')
+        @sc_dir = true
         Dir.chdir('stack_car')
         self.destination_root += "/stack_car"
       end

data/lib/stack_car/version.rb

@@ -1,3 +1,3 @@
 module StackCar
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/templates/.gitlab-ci.yml.erb

@@ -1,5 +1,6 @@
 stages:
 - build
+- lint
 - test
 - deploy
 

data/templates/Dockerfile.erb

@@ -1,14 +1,13 @@
 FROM CHANGEME/base:latest
-<% if options[:git] %>
+<% if options[:git] -%>
 ARG BRANCH=master
 ARG REPO_URL
-<% end %>
+<% end -%>
 
-ADD http://timejson.herokuapp.com build-time
 ADD ops/webapp.conf /etc/nginx/sites-enabled/webapp.conf
 ADD ops/env.conf /etc/nginx/main.d/env.conf
 
-<% if options[:git] %>
+<% if options[:git] -%>
 RUN /sbin/setuser app bash -l -c "set -x && \
   git fetch -ap && \
   git reset --hard && \
@@ -18,14 +17,15 @@ RUN /sbin/setuser app bash -l -c "set -x && \
   bundle exec rake assets:clobber assets:precompile DATABASE_ADAPTER=nulldb && \
   mv /home/app/webapp/public/assets /home/app/webapp/public/assets-new && \
   mv /home/app/webapp/public/packs /home/app/webapp/public/packs-new"
-<% else %>
+<% else -%>
+RUN gem install bundler -v CHANGEME # Add the BUNDLED WITH version listed at the bottom of the Gemfile.lock
 COPY --chown=app . $APP_HOME
 RUN /sbin/setuser app bash -l -c "set -x && \
   (bundle check || bundle install) && \
   bundle exec rake assets:clobber assets:precompile DATABASE_ADAPTER=nulldb && \
   mv /home/app/webapp/public/assets /home/app/webapp/public/assets-new && \
   mv /home/app/webapp/public/packs /home/app/webapp/public/packs-new"
-<% end %>
+<% end -%>
 
 RUN bash -l -c "set -x && \
   rm -f /etc/service/nginx/down"

data/templates/docker-compose.yml.erb

@@ -97,24 +97,16 @@ services:
       - "8080"
 <% end -%>
 
-  base:
-    image: "${REGISTRY_HOST}${REGISTRY_URI}/base:latest"
-    build:
-      context: .
-      dockerfile: Dockerfile.base
-      args:
-        DEPLOY_KEY: "${DEPLOY_KEY}"
-        APP_NAME: "${APP_NAME}"
-        REPO_URL: "${REPO_URL}"
-    env_file:
-      - .env
-      - .env.development
-
   app:
     build:
-      context: ..
+    <% if @sc_dir -%>
+  context: ..
       dockerfile: stack_car/Dockerfile
-      args:
+    <% else -%>
+  context: .
+      dockerfile: Dockerfile
+    <% end -%>
+  args:
         DEPLOY_KEY: "${DEPLOY_KEY}"
         REPO_URL: "${REPO_URL}"
         BRANCH: "${BRANCH}"
@@ -133,8 +125,7 @@ services:
     tty: true
 
   web:
-    extends:
-      app:
+    extends: app
     ports:
       - "${WEB_PORT}"
     environment:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stack_car
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -169,7 +169,6 @@ files:
 - templates/.env.development.erb
 - templates/.env.erb
 - templates/.gitlab-ci.yml.erb
-- templates/Dockerfile.base.erb
 - templates/Dockerfile.builder.erb
 - templates/Dockerfile.erb
 - templates/README.md

data/templates/Dockerfile.base.erb

@@ -1,57 +0,0 @@
-FROM phusion/passenger-ruby26:1.0.9
-ARG DEPLOY_KEY
-<% if options[:git] %>
-ARG REPO_URL
-<% end %>
-
-RUN <%= pre_apt_string %> && \
-    curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
-    apt-get update -qq && \
-    apt-get install -y \
-      build-essential \
-      libsasl2-dev \
-      nodejs \
-      pv \
-      tzdata \
-      <%= apt_packages_string %> && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
-    <%= post_apt_string %>
-
-<% if options[:fcrepo] %>
-RUN mkdir -p /opt/fits && \
-  curl -fSL -o /opt/fits/fits-latest.zip https://projects.iq.harvard.edu/files/fits/files/fits-1.3.0.zip && \
-  cd /opt/fits && unzip fits-latest.zip && chmod +X /opt/fits/fits.sh
-<% end -%>
-
-RUN rm /etc/nginx/sites-enabled/default
-COPY ops/webapp.conf /etc/nginx/sites-enabled/webapp.conf
-COPY ops/env.conf /etc/nginx/main.d/env.conf
-
-ENV APP_HOME /home/app/webapp
-RUN mkdir $APP_HOME
-WORKDIR $APP_HOME
-
-ENV BUNDLE_GEMFILE=$APP_HOME/Gemfile \
-  BUNDLE_JOBS=4
-
-COPY --chown=app Gemfile* $APP_HOME/
-RUN /sbin/setuser app bash -l -c "gem update bundler && (bundle check || bundle install)"
-
-<% if options[:git] %>
-RUN chown -R app $APP_HOME && /sbin/setuser app bash -l -c "git clone --depth 2 ${REPO_URL} ${APP_HOME}""
-<% else %>
-COPY --chown=app . $APP_HOME
-<% end %>
-
-<% if options[:imagemagick] %>
-# reenables pdfs in imagemagick see https://ubuntuforums.org/showthread.php?t=2403266
-RUN sed -i '/PDF/s/none/read|write/' /etc/ImageMagick-6/policy.xml
-<% end %>
-
-# this is so that these items are cached and only have to be updated
-RUN  /sbin/setuser app /bin/bash -l -c 'cd /home/app/webapp && DATABASE_ADAPTER=nulldb bundle exec rake assets:precompile'
-# Asset complie and migrate if prod, otherwise just start nginx
-ADD ops/nginx.sh /etc/service/nginx/run
-RUN chmod +x /etc/service/nginx/run
-RUN rm -f /etc/service/nginx/down