lib/smartcloud/grids/grid-runner/Dockerfile in smartcloud-0.0.137 vs lib/smartcloud/grids/grid-runner/Dockerfile in smartcloud-0.0.138

- old
+ new

@@ -19,34 +19,20 @@ # ----- Original fcgiwrap: https://github.com/gnosek/fcgiwrap # ----- Custom fcgiwrap: https://github.com/notr1ch/fcgiwrap # - git and git-daemon, because that gets us the git-http-backend CGI script # - ruby, to run smartcloud gem # - spawn-fcgi, to launch fcgiwrap and to create the unix socket -COPY fcgiwrap /root/apk-packages/fcgiwrap -RUN apk add /root/apk-packages/fcgiwrap/packages/main/x86_64/fcgiwrap-1.1.1-r4.apk --allow-untrusted && \ - rm -rf /root/apk-packages +# COPY fcgiwrap /root/apk-packages/fcgiwrap +# RUN apk add /root/apk-packages/fcgiwrap/packages/main/x86_64/fcgiwrap-1.1.1-r4.apk --allow-untrusted && \ + # rm -rf /root/apk-packages RUN apk add --update coreutils && \ + apk add --update util-linux && \ apk add --update git && \ apk add --update git-daemon && \ apk add --update ruby && \ + apk add --update fcgiwrap && \ apk add --update spawn-fcgi && \ - apk add --update lsof && \ - apk add --update util-linux && \ rm -rf /var/cache/apk/* RUN gem install smartcloud --no-rdoc --no-ri - -# COPY spawner.rb "/spawner.rb" - -# Generating entrypoint file -# RUN echo -e '#!/bin/sh\n\ -# \n\ -# ruby /spawner.rb\n\ -# \n\ -# su - $USER_NAME\n\ -# \n\ -# exec "$@"' >> /entrypoint; chmod +x /entrypoint; - -# Set entrypoint -#ENTRYPOINT ["/entrypoint"] CMD "git, fcgiwrap & spawn-fcgi installed"