Merge pull request #200 from cpcwood/add-helm

Rework CI and deployment to use helm

Author: cpcwood

.circleci/config.yml

@@ -4,6 +4,7 @@ services:
     stdin_open: true
     image: cpcwood/home-server-app-dev
     container_name: home-server-app-dev
+    init: true
     build:
       context: ../..
       dockerfile: .docker/dockerfiles/dev.Dockerfile
@@ -36,6 +37,7 @@ services:
     stdin_open: true
     image: cpcwood/home-server-client-dev
     container_name: home-server-client-dev
+    init: true
     build:
       context: ../..
       dockerfile: .docker/dockerfiles/dev.Dockerfile
@@ -62,6 +64,7 @@ services:
     stdin_open: true
     image: cpcwood/home-server-worker-dev
     container_name: home-server-worker-dev
+    init: true
     build: 
       context: ../../
       dockerfile: .docker/dockerfiles/dev.Dockerfile

.docker/docker-compose/dev.yml

@@ -20,6 +20,7 @@ ENV BUNDLE_PATH=$APP_HOME/vendor/bundle \
 
 RUN apk add --no-cache \
     bash \
+    tini \
     tzdata \
     postgresql-client \
     nodejs \
@@ -42,4 +43,6 @@ COPY --chown=docker:docker --from=cpcwood/home-server-base $APP_HOME $APP_HOME
 COPY --chown=docker:docker --from=cpcwood/home-server-base /var/opt/maxmind/GeoLite2-City.mmdb /var/opt/maxmind/GeoLite2-City.mmdb
 COPY --chown=docker:docker --from=cpcwood/home-server-worker-dependencies $APP_HOME/node_modules $APP_HOME/node_modules
 
+# Sidekiq jobs shell out to chromium/imagemagick; tini reaps the subprocesses they orphan
+ENTRYPOINT ["/sbin/tini", "--"]
 CMD ["./.docker/scripts/startup-worker"]

.docker/dockerfiles/worker.Dockerfile

@@ -1,3 +1,3 @@
 #!/bin/bash
 fixuid 2>/dev/null
-"$@"
+exec "$@"

.docker/scripts/entrypoint-dev

@@ -16,4 +16,4 @@ fi
 bundle exec rails sitemap:refresh:no_ping
 bundle exec rails whenever --update-crontab
 
-bundle exec rails server -b 0.0.0.0 -p 5000
+exec bundle exec rails server -b 0.0.0.0 -p 5000

.docker/scripts/startup-app

@@ -18,4 +18,4 @@ else
 	bundle exec rails db:setup
 fi
 
-bundle exec rails server -b 0.0.0.0 -p 5000
+exec bundle exec rails server -b 0.0.0.0 -p 5000

.docker/scripts/startup-app-dev

@@ -5,4 +5,4 @@ if ! bundle check >/dev/null ; then
 fi
 
 echo 'starting client build server'
-./bin/webpacker-dev-server
+exec ./bin/webpacker-dev-server

.docker/scripts/startup-client-dev

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bundle exec sidekiq -C config/sidekiq.yml
+exec bundle exec sidekiq -C config/sidekiq.yml

.docker/scripts/startup-worker

@@ -9,4 +9,4 @@ if ! bundle check >/dev/null ; then
   bundle install
 fi
 
-bundle exec sidekiq -C config/sidekiq.yml
+exec bundle exec sidekiq -C config/sidekiq.yml

.docker/scripts/startup-worker-dev

@@ -0,0 +1 @@
+use flake ./infrastructure