master
Bel LaPointe 2019-04-15 13:37:41 -06:00
parent a98e30ee96
commit 114cbdd461
1 changed files with 8 additions and 8 deletions

16
do.sh
View File

@ -177,20 +177,18 @@ echo "$DOCKERFILE" > "$dockfile"
} }
function rb_dockerfiles() { function rb_dockerfiles() {
from="ruby:2.5.5-alpine3.9" from="ruby:2.6.2-alpine3.9"
if [ "$(uname -s)" == "Darwin" ]; then if [ "$(uname -s)" == "Darwin" ]; then
from="registry-app.eng.qops.net:5001/imported/alpine/ruby:alpine" from="registry-app.eng.qops.net:5001/imported/alpine/ruby:alpine"
fi fi
cp=( \ cp=( $(find . -mindepth 1 -maxdepth 1 -type f | grep -v "$dockfile" | grep -v '\.[^\.]*\.sw[a-z]$') )
$(find . -mindepth 1 -maxdepth 1 -type f | grep -v "$dockfile") \ cpd=( $(find . -mindepth 1 -maxdepth 1 -type d | grep -v \\.git || true) )
$(find . -mindepth 1 -type d | grep -v \\.git || true) \
)
gf="" gf=""
if [ -e ./Gemfile ]; then if [ -e ./Gemfile ]; then
gf=' gf='
COPY ./Gemfile /main/Gemfile COPY ./Gemfile /main/Gemfile
RUN bundler install --gemfile=/main/Gemfile RUN BUNDLE_FORCE_RUBY_PLATFORM=1 bundler install --gemfile=/main/Gemfile
' '
fi fi
@ -206,11 +204,13 @@ FROM '"$from"'
MAINTAINER breel@qualtrics.com MAINTAINER breel@qualtrics.com
RUN mkdir -p /var/log RUN mkdir -p /var/log
WORKDIR /main WORKDIR /main
ENV MNT="/mnt/" ENV HOME=/main
ENV MNT=/mnt/
COPY --from=certs /etc/ssl/certs /etc/ssl/certs COPY --from=certs /etc/ssl/certs /etc/ssl/certs
RUN apk add --no-cache ruby ruby-bundler RUN apk add --no-cache ruby ruby-bundler alpine-sdk
'"$gf"' '"$gf"'
COPY '"${cp[@]}"' /main/ COPY '"${cp[@]}"' /main/
'"$(for dir in ${cpd[@]}; do printf "COPY $dir /main/${dir##*/}\n"; done)"'
ENTRYPOINT ["ruby", "/main/'"${main##*/}"'"] ENTRYPOINT ["ruby", "/main/'"${main##*/}"'"]
CMD [] CMD []
' '