diff --git a/Dockerfile b/Dockerfile index 2daf174..17d7491 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,3 @@ -FROM node:8.9-alpine -FROM xataz/nginx FROM ruby:2.4.2-alpine3.6 ENV UID=991 GID=991 \ @@ -28,10 +26,13 @@ RUN export BUILD_DEPS="build-base \ && cd /diaspora \ && chmod +x script/server \ && bin/bundle config --global silence_root_warning 1 \ -&& bin/bundle install --retry 4 --without test development --verbose \ +&& bin/bundle install --retry 4 --without test development \ && apk del ${BUILD_DEPS} \ && rm -rf /tmp/* /var/cache/apk/* /tmp/* /root/.gnupg /root/.cache/ /diaspora/.git +FROM node:8.9-alpine +FROM xataz/nginx + COPY rootfs/ / RUN chmod +x /usr/local/bin/startup \