diff options
| -rw-r--r-- | Dockerfile.base | 13 | ||||
| -rw-r--r-- | Dockerfile.project | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Dockerfile.base b/Dockerfile.base index 2957289..894586c 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -22,13 +22,16 @@ USER "$JEKYLL_USER" ENV PATH="/home/$JEKYLL_USER/.local/bin:$PATH" ENV MAKEFILE_DIR="/utils" -COPY ["Makefile", "$MAKEFILE_DIR/"] +RUN sudo mkdir -p -- "$MAKEFILE_DIR" && \ + sudo chown -- "$JEKYLL_USER:$JEKYLL_USER" "$MAKEFILE_DIR" WORKDIR "$MAKEFILE_DIR" -RUN sudo make ruby-install && \ - sudo make ruby-install/clean && \ +COPY --chown="$JEKYLL_USER:$JEKYLL_USER" ["Makefile", "./"] + +RUN make ruby-install && \ + make ruby-install/clean && \ make ruby && \ - sudo make chruby && \ + make chruby && \ sudo make chruby/profile.d && \ - sudo make chruby/clean && \ + make chruby/clean && \ make bundler diff --git a/Dockerfile.project b/Dockerfile.project index fd74035..bae05e6 100644 --- a/Dockerfile.project +++ b/Dockerfile.project @@ -3,8 +3,8 @@ FROM jekyll_base ENV PROJECT_DIR="/project" RUN sudo mkdir -p -- "$PROJECT_DIR" && \ sudo chown -- "$JEKYLL_USER:$JEKYLL_USER" "$PROJECT_DIR" + COPY --chown="$JEKYLL_USER:$JEKYLL_USER" ["Gemfile", "Gemfile.lock", "$PROJECT_DIR/"] RUN make dependencies - COPY --chown="$JEKYLL_USER:$JEKYLL_USER" [".", "$PROJECT_DIR/"] CMD make jekyll/serve |