remove private registry dependency for local development

Author: jonasjabari

.dockerignore

@@ -8,14 +8,6 @@ spec/dummy/public/packs-test/
 spec/dummy/yarn-error.log
 spec/dummy/storage/
 spec/dummy/tmp/
-builder/db/*.sqlite3
-builder/db/*.sqlite3-journal
-builder/log/*.log
-builder/node_modules/
-builder/yarn-error.log
-builder/storage/
-builder/tmp/
-builder/public/packs
 .idea/
 .vscode
 .byebug_history

Dockerfile.postgres

@@ -0,0 +1,4 @@
+FROM postgres:10.6-alpine
+
+COPY setpw.sh /usr/bin/
+RUN chmod +x /usr/bin/setpw.sh

Dockerfile.release

@@ -1 +1,26 @@
-FROM registry.gitlab.com/basemate-ops/workflow/release:latest
+FROM ruby:2.7.2-alpine3.12
+
+RUN gem install bundler:2.1.4
+
+RUN apk update --no-cache && \
+    apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev npm && \
+    mkdir -p /app
+
+WORKDIR /app
+
+COPY ./lib/ /app/lib/
+COPY matestack-ui-bootstrap.gemspec /app/
+COPY Gemfile* yarn* /app/
+RUN bundle install
+
+COPY package.json* /app/
+RUN yarn install
+
+COPY entrypoint.sh /usr/bin/
+RUN chmod +x /usr/bin/entrypoint.sh
+ENTRYPOINT ["entrypoint.sh"]
+
+COPY . /app/
+RUN touch /app/.env && set -a && source /app/.env && set +a && bundle exec rails assets:precompile RAILS_ENV=production
+
+CMD ["bundle", "exec", "rails", "server"]

docker-compose.production.yml

@@ -2,7 +2,9 @@ version: '3'
 services:
 
   postgres:
-    image: registry.gitlab.com/basemate-ops/workflow/postgres
+    build:
+      context: .
+      dockerfile: ./Dockerfile.postgres
     expose:
       - 5432
     volumes:

docker-compose.yml

@@ -2,7 +2,9 @@ version: '3'
 services:
 
   postgres:
-    image: registry.gitlab.com/basemate-ops/workflow/postgres
+    build:
+      context: .
+      dockerfile: ./Dockerfile.postgres
     expose:
       - 5432
     volumes:
@@ -44,20 +46,6 @@ services:
     volumes:
       - redis-volume:/data
 
-  # webpack-watcher:
-  #   build:
-  #     context: .
-  #     dockerfile: ./Dockerfile.dev
-  #   environment:
-  #     RAILS_ENV: development
-  #   volumes:
-  #     - ./:/app
-  #     - gem-volume:/usr/local/bundle
-  #     - node-volume:/app/node_modules
-  #     - builder-node-volume:/app/builder/node_modules
-  #   command: "sh -c 'cd builder && ./bin/webpack --watch'"
-  #   user: ${CURRENT_UID}
-
 volumes:
   data-volume:
   gem-volume:

entrypoint.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+
+# bundle install runs initally ON BUILD which installs all required gems
+# this creates a Gemfile.lock on the image /app/Gemfile.lock
+# mounting a directory without Gemfile.lock on image:/app causes Gemfile.lock to disappear
+# therefore:
+# If no Gemfile.lock is present, run bundle install again (should be very fast)
+if [[ ! -e /app/Gemfile.lock ]]; then
+    bundle install
+fi
+
+# Remove a potentially pre-existing server.pid for Rails.
+rm -f /app/tmp/pids/server.pid
+
+# Then exec the container's main process (what's set as CMD in the Dockerfile).
+exec "$@"

setpw.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+psql -U postgres -c "ALTER USER postgres WITH PASSWORD '$POSTGRES_PASSWORD'"