mkbrut 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e824bb238690c5bedee83be7104bc4a8a4e82c5a46fbf4aa75253e16c83ef036
-  data.tar.gz: 495469a00fc5fee4adf35057cd03cb6f942551c60954d8639b780fe2896d5aff
+  metadata.gz: c82504e23c5bf5270d84b01b7717c8842cfbdec2a09c61976fdf3d2ec7d2d040
+  data.tar.gz: 4ac6e8c52d140a5e2b83378e9de8b79c0089a7612de3c3286c80d0dcaeb93357
 SHA512:
-  metadata.gz: 6518144e68422c5673413ab1539a064721d3f230a6953b785dbb23056b03e8cc6ebdeb9ae02bd7b57aa8f21a854747396aa65b45e6b7d1c0269a79c639ccd7ab
-  data.tar.gz: d101e05f6d7afef6115be141f3307f8360bde7f1976ef1129ed3584cbd2fe6a502d721be27042afd7d296a3fd12a15974e79c5c3ff387d484bd8827a1a65b620
+  metadata.gz: 4ff91f6a6f3297e9ae8eea8e82cdd2a689165bb57b41a81fc2246d8b1235131d506c56368b9cce9fb7a16da121cee83bc76dd0f7342756e88de2088b6b701cf9
+  data.tar.gz: 5b59bf2ed9c33a33f0e961e34b00195818dba5666bd7b92a00f008ee4b1556d79472921d4adc192e2ed08a3790d3f5e2c58585760d7c172bbe9ba6497cc7ed34

data/lib/mkbrut/version.rb

@@ -1,3 +1,3 @@
 module MKBrut
-  VERSION = "0.2.7"
+  VERSION = "0.3.0"
 end

data/templates/Base/docker-compose.dx.yml

@@ -39,7 +39,7 @@ services:
         target: "/var/run/docker.sock"
     # This is what is started up when you run `dx/start`. It just
     # waits forever keeping the container running.
-    entrypoint: /home/appuser/show-help-in-app-container-then-wait.sh
+    command: /home/appuser/show-help-in-app-container-then-wait.sh
     # The working directory for any command, this is the same as your
     # project root.
     working_dir: ${PWD}

data/templates/Base/dx/exec

@@ -9,17 +9,21 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${0}" )" > /dev/null 2>&1 && pwd )
 require_command "docker"
 load_docker_compose_env
 
-usage_description="Execute a command inside the app's container."
-usage_args="[-s service] command"
+usage_description="Execute a command inside the app's container. Any command other than 'bash' will be run with bash -lc. Use -B to just run the command directly."
+usage_args="[-s service] [-B] command"
 usage_pre="exec.pre"
 usage_on_help "${usage_description}" "${usage_args}" "${usage_pre}" "" "${@}"
 
 SERVICE="${SERVICE_NAME:-${DEFAULT_SERVICE}}"
-while getopts "s:" opt "${@}"; do
+INCLUDE_PREFIX_FOR_NON_BASH=true
+while getopts "s:B" opt "${@}"; do
   case ${opt} in
     s )
       SERVICE="${OPTARG}"
       ;;
+    B )
+      INCLUDE_PREFIX_FOR_NON_BASH=false
+      ;;
     \? )
       log "🛑" "Unknown option: ${opt}"
       usage "${description}" "${usage_args}" "${usage_pre}"
@@ -42,7 +46,15 @@ if ! exec_hook_if_exists "exec.pre"; then
   exit 1
 fi
 
-log "🚂" "Running '${*}' inside container with service name '${SERVICE}'"
+if [ "$#" -eq 1 ] && [ "$1" = "bash" ]; then
+  COMMAND=(bash)
+elif [ "$INCLUDE_PREFIX_FOR_NON_BASH" = "true" ]; then
+  COMMAND=(bash -lc "$*")
+else
+  COMMAND=("$@")
+fi
+
+log "🚂" "Running '${COMMAND[@]}' inside container with service name '${SERVICE}'"
 
 docker \
   compose \
@@ -51,6 +63,6 @@ docker \
     --env-file "${ENV_FILE}" \
   exec \
     "${SERVICE}" \
-    "${@}"
+    "${COMMAND[@]}"
 
 # vim: ft=bash

data/templates/segments/Heroku/deploy/docker-entrypoint

@@ -0,0 +1,15 @@
+#!/bin/bash -e
+
+# This is the Docker entrypoint, mean this script is used to execute
+# the command given to the RUN directive.
+#
+# The reason this exists is to load jemalloc. If you don't want to use
+# jemalloc, you can delete this script, as well as the ENTRYPOINT directive
+# in deploy/Dockerfile.
+
+# Enable jemalloc for reduced memory usage and latency.
+if [ -z "${LD_PRELOAD+x}" ] && [ -f /usr/lib/*/libjemalloc.so.2 ]; then
+  export LD_PRELOAD="$(echo /usr/lib/*/libjemalloc.so.2)"
+fi
+
+exec "${@}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mkbrut
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Dave Copeland
@@ -181,6 +181,7 @@ files:
 - templates/segments/Demo/specs/front_end/pages/new_guestbook_message_page.spec.rb
 - templates/segments/Heroku/bin/deploy
 - templates/segments/Heroku/deploy/Dockerfile
+- templates/segments/Heroku/deploy/docker-entrypoint
 - templates/segments/Heroku/deploy/heroku_config.rb
 homepage: https://brutrb.com
 licenses: []