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