stack_car 0.9.0 → 0.12.0

data/templates/.env.development.erb

@@ -1 +1,3 @@
 # Items in this file override those in .env and are good for developer system specific preferences
+# if not using dory uncomment the next line
+WEB_PORT=3000:80

data/templates/.env.erb

@@ -1,18 +1,23 @@
+APP_NAME=<%= @project_name %>
+PASSENGER_APP_ENV=development
+REGISTRY_HOST=registry.gitlab.com
+REGISTRY_URI=/CHANGEME/<%= @project_name %>
+TAG=dev
 <% if options[:postgres] -%>
-POSTGRES_DB=<%= @project_name %>
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=DatabaseFTW
-POSTGRES_HOST=postgres
-DB_ADAPTER=postgresql
+DATABASE_NAME=<%= @project_name %>
+DATABASE_USER=postgres
+DATABASE_PASSWORD=DatabaseFTW
+DATABASE_HOST=postgres
+DATABASE_ADAPTER=postgresql
 TEST_DB=<%= @project_name %>_test
 <% end -%>
 <% if options[:mysql] -%>
-MYSQL_DATABASE=<%= @project_name %>
-MYSQL_USER=root
-MYSQL_PASSWORD=DatabaseFTW
+DATABASE_NAME=<%= @project_name %>
+DATABASE_USER=<%= @project_name %>
+DATABASE_PASSWORD=DatabaseFTW
 MYSQL_ROOT_PASSWORD=DatabaseFTW
-MYSQL_HOST=mysql
-DB_ADAPTER=mysql2
+DATABASE_HOST=mysql
+DATABASE_ADAPTER=mysql2
 TEST_DB=<%= @project_name %>_test
 <% end -%>
 <% if options[:elasticsearch] -%>
@@ -22,9 +27,3 @@ ES_URL=http://elasticsearch:9200
 SITE_URI=https://CHANGEME.com
 DEPLOY_HOOK=CHANGEME
 <% end -%>
-REGISTRY_HOST=registry.gitlab.com
-REGISTRY_URI=/CHANGEME/<%= @project_name %>
-TAG=dev
-VIRTUAL_PORT=80
-PASSENGER_APP_ENV=development
-DOCKER_PORT=3000:80

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

@@ -1,71 +1,96 @@
-image: $CI_REGISTRY_IMAGE/builder:latest
-services:
-  - docker:dind
-<% if options[:postgres] -%>
-  - postgres:latest
-<% end -%>
-<% if options[:mysql] -%>
-  - mysql:latest
-<% end -%>
-<% if options[:solr] -%>
-  - solr:latest
-<% end -%>
-<% if options[:elasticsearch] -%>
-  - elasticsearch:latest
-<% end -%>
-<% if options[:redis] -%>
-  - redis:latest
-<% end -%>
-
 stages:
-  - build
-  - test
-  - review
-  - staging
-  - production
-
-variables:
-<% if options[:postgres] -%>
-  POSTGRES_DB: <%= @project_name %>
-  POSTGRES_USER: postgres
-  POSTGRES_PASSWORD: password
-  POSTGRES_HOST: postgres
-<% end -%>
-<% if options[:mysql] -%>
-  MYSQL_DATABASE: <%= @project_name %>
-  MYSQL_ROOT_PASSWORD: password
-  MYSQL_USER: <%= @project_name %>_test
-  MYSQL_PASSWORD: password
-  MYSQL_HOST: mysql
-<% end -%>
-  TEST_DB: <%= @project_name %>
-  DOCKER_DRIVER: overlay
-  REGISTRY_HOST: registry.gitlab.com
-  REGISTRY_URI: TODO/<%= @project_name %>
-  SITE_URI_BASE: TODO
-
+- build
+- test
+- deploy
 
 before_script:
-  - export REGISTRY_FULL=registry.gitlab.com/notch8/ror-site/$CI_COMMIT_REF_SLUG:${CI_COMMIT_SHA:0:8}
-  - export TAG=$CI_COMMIT_REF_SLUG
-  - eval $(ssh-agent -s)
-  - bash
-  - ssh-add <(echo "$SSH_PRIVATE_KEY") 
-  - mkdir -p ~/.ssh
-  - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+- export TAG=${CI_COMMIT_SHORT_SHA}
+- export BRANCH=${CI_COMMIT_REF_NAME}
+- export REGISTRY_HOST=${CI_REGISTRY}
+- export REGISTRY_URI="/${CI_PROJECT_PATH}"
+
+base:
+  stage: build
+  script:
+    - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY
+    - sc build -s base
+    - sc push -s base
+  when: manual
+  tags:
+    - local
 
 build:
   stage: build
   script:
-    - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
+    - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY
     - sc build
     - sc push
+    - docker tag $CI_REGISTRY_IMAGE:$TAG $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+  tags:
+    - local
+
+lint:
+  stage: go
+  image: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
+  variables:
+    PRONTO_GITLAB_API_ENDPOINT: "https://gitlab.com/api/v4"
+  before_script:
+    - export PRONTO_GITLAB_API_PRIVATE_TOKEN=$GITLAB_API_TOKEN
+  script:
+    - cd /home/app/webapp && bundle exec pronto run -f gitlab
   tags:
     - docker
 
 test:
   stage: test
-  image: $CI_REGISTRY_IMAGE:$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
+  image: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
+  services:
+    <% if options[:postgres] -%>
+    - name: postgres:11.1
+    <% end -%>
+    <% if options[:mysql] -%>
+    - mysql:5.7
+    <% end -%>
+    <% if options[:solr] -%>
+    - name: solr:latest
+      entrypoint: ["docker-entrypoint.sh", "solr-precreate", "test"]
+    <% end -%>
+    <% if options[:elasticsearch] -%>
+    - elasticsearch:latest
+    <% end -%>
+    <% if options[:redis] -%>
+    - redis:latest
+    <% end -%>
+    <% if options[:fcrepo] -%>
+    - name: botimer/fcrepo:4.5.1
+    <% end %>
+  variables:
+  <% if options[:postgres] -%>
+    POSTGRES_DB: <%= @project_name %>
+    POSTGRES_USER: postgres
+    POSTGRES_PASSWORD: password
+    POSTGRES_HOST: postgres
+    DATABASE_ADAPTER: postgresql
+    DATABASE_HOST: postgres
+    DATABASE_NAME: <%= @project_name %>
+    DATABASE_PASSWORD: password
+    DATABASE_USER: postgres
+  <% end -%>
+  <% if options[:mysql] -%>
+    MYSQL_DATABASE: <%= @project_name %>
+    MYSQL_ROOT_PASSWORD: password
+    MYSQL_USER: <%= @project_name %>_test
+    MYSQL_PASSWORD: password
+    MYSQL_HOST: mysql
+    DATABASE_ADAPTER: mysql2
+    DATABASE_HOST: mysql
+    DATABASE_NAME: <%= @project_name %>
+    DATABASE_PASSWORD: password
+    DATABASE_USER: <%= @project_name %>_test
+  <% end -%>
+    TEST_DB: <%= @project_name %>
+    SITE_URI_BASE: TODO
   script:
     - cd /home/app/webapp && bundle exec rake db:create db:schema:load spec
   tags:
@@ -77,7 +102,7 @@ review:
   stage: review
   type: deploy
   environment:
-    name: $CI_PROJECT_NAME-$CI_COMMIT_REF_SLUG
+    name: $CI_COMMIT_REF_SLUG
     url: http://web.$CI_PROJECT_NAME-$CI_COMMIT_REF_SLUG.staging.$SITE_URI_BASE
     on_stop: stop_review
   only:
@@ -88,12 +113,13 @@ review:
 <% if options[:rancher] -%>
     - export RANCHER_ENVIRONMENT=staging
     - sc provision ci
-<% else %>
+<% elsif options[:helm] -%>
+    - ./chart/bin/deploy review $CI_COMMIT_REF_SLUG
+<% else -%>
     - CHANGME
-<% end %>
+<% end -%>
  tags:
-    - docker
-    - mysql
+    - local
 
 stop_review:
   stage: review
@@ -101,6 +127,8 @@ stop_review:
 <% if options[:rancher] -%>
     - export RANCHER_ENVIRONMENT=staging
     - rancher rm $CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
+<% elsif options[:helm] -%>
+    - ./chart/bin/remove review $CI_COMMIT_REF_SLUG
 <% end %>
   when: manual
   environment:
@@ -112,7 +140,9 @@ staging:
   type: deploy
   script:
 <% if options[:rancher] -%>
-    - sc deploy staging 
+  - sc deploy staging
+<% elsif options[:helm] -%>
+  - ./chart/bin/deploy staging $CI_COMMIT_REF_SLUG
 <% end -%>
 <% if options[:heroku] -%>
   - dpl --provider=heroku --app=<%= @project_name %>-staging --api-key=$HEROKU_STAGING_API_KEY --run="bundle exec rake db:migrate"
@@ -120,7 +150,7 @@ staging:
   only:
     - master
   tags:
-    - docker
+    - local
 
 production:
   stage: production
@@ -128,6 +158,8 @@ production:
   script:
 <% if options[:rancher] -%>
     - sc deploy production
+<% elsif options[:helm] -%>
+  - ./chart/bin/deploy production $CI_COMMIT_REF_SLUG
 <% end -%>
 <% if options[:heroku] -%>
   - dpl --provider=heroku --app=<%= @project_name %> --api-key=$HEROKU_PRODUCTION_API_KEY --run="bundle exec rake db:migrate"
@@ -136,4 +168,4 @@ production:
   only:
     - master
   tags:
-    - docker
+    - local

data/templates/Dockerfile.base.erb

@@ -1,23 +1,32 @@
-FROM phusion/passenger-ruby23:0.9.28
+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_8.x | bash - && \
+    curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
     apt-get update -qq && \
-    apt-get install -y build-essential nodejs pv tzdata libsasl2-dev <%= apt_packages_string %> && \
+    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-0.8.5.zip http://projects.iq.harvard.edu/files/fits/files/fits-0.8.5.zip && \
-    cd /opt && \
-    unzip fits-0.8.5.zip && \
-    chmod +x fits-0.8.5/fits.sh
-
+  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
@@ -26,23 +35,23 @@ WORKDIR $APP_HOME
 ENV BUNDLE_GEMFILE=$APP_HOME/Gemfile \
   BUNDLE_JOBS=4
 
-ADD Gemfile* $APP_HOME/
-RUN bundle check || bundle install
+COPY --chown=app Gemfile* $APP_HOME/
+RUN /sbin/setuser app bash -l -c "gem update bundler && (bundle check || bundle install)"
 
-<% if options[:delayed_job] || options[:sidekiq] %>
-RUN touch /var/log/worker.log && chmod 666 /var/log/worker.log
-RUN mkdir /etc/service/worker
-ADD ops/worker.sh /etc/service/worker/run
-RUN chmod +x /etc/service/worker/run
+<% 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 %>
 
-ADD . $APP_HOME
-RUN chown -R app $APP_HOME
+<% 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 && DB_ADAPTER=nulldb bundle exec rake assets:precompile'
+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
-

data/templates/Dockerfile.erb

@@ -1,14 +1,33 @@
 FROM CHANGEME/base:latest
+<% if options[:git] %>
+ARG BRANCH=master
+ARG REPO_URL
+<% end %>
 
-ADD http://time.jsontest.com build-time
+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
-ADD . $APP_HOME
 
-RUN cd /home/app/webapp && \
-    (/sbin/setuser app bundle check || /sbin/setuser app bundle install) && \
-    /sbin/setuser app bundle exec rake assets:precompile DB_ADAPTER=nulldb && \
-    chown -R app $APP_HOME && \
-    rm -f /etc/service/nginx/down
+<% if options[:git] %>
+RUN /sbin/setuser app bash -l -c "set -x && \
+  git fetch -ap && \
+  git reset --hard && \
+  git checkout $BRANCH && \
+  git pull && \
+  (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"
+<% else %>
+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 %>
+
+RUN bash -l -c "set -x && \
+  rm -f /etc/service/nginx/down"
 
 CMD ["/sbin/my_init"]

data/templates/chart-fcrepo/fcrepo-deploy.yaml

@@ -0,0 +1,63 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ template "app.fcrepo.name" . }}
+  labels:
+    app: {{ template "app.name" . }}
+    chart: {{ template "app.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+    component: fcrepo
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ template "app.name" . }}
+      release: {{ .Release.Name }}
+      component: fcrepo
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app: {{ template "app.name" . }}
+        release: {{ .Release.Name }}
+        component: fcrepo
+    spec:
+      restartPolicy: Always
+      {{- if .Values.fcrepo.imagePullSecrets }}
+      imagePullSecrets:
+        {{ toYaml .Values.fcrepo.imagePullSecrets }}
+      {{- end }}
+      volumes:
+        - name: data
+          persistentVolumeClaim:
+            claimName: {{ template "app.fcrepo.name" . }}
+      initContainers:
+        - name: "remove-lost-found"
+          image: "busybox:1.25.0"
+          command: 
+            - rm
+            - -fr
+            - /data/lost+found
+          volumeMounts:
+            - name: data
+              mountPath: /data
+      containers:
+        - name: fcrepo
+          image: {{ .Values.fcrepo.image.repository }}:{{ .Values.fcrepo.image.tag }}
+          livenessProbe:
+            tcpSocket:
+              port: 8080
+          readinessProbe:
+            tcpSocket:
+              port: 8080
+          volumeMounts:
+            - name: data
+              mountPath: /data
+          envFrom:
+            - configMapRef:
+                name: {{ template "app.fcrepo-env.name" . }}
+            - secretRef:
+                name: {{ template "app.fcrepo-env.name" . }}