diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-17 13:55:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-17 13:55:37 +0100 |
commit | 381137c94e6cf341117adddc673cfac82760c710 (patch) | |
tree | 5cfc5f89aaa1d20f5801da6bf56e4cd14bb59433 /Dockerfile | |
parent | ab7d99e035f5b880ef77440e7c2e76f8e8728992 (diff) | |
parent | c22f3a87a3598210ffa28517e42c2fc619dbcef5 (diff) |
Merge pull request #1951 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Dockerfile')
-rw-r--r-- | Dockerfile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index cf311fef2..57274cfd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1.4 FROM ubuntu:20.04 as build-dep # Use bash for the shell @@ -65,8 +66,8 @@ RUN cd /opt/mastodon && \ FROM ubuntu:20.04 # Copy over all the langs needed for runtime -COPY --from=build-dep /opt/node /opt/node -COPY --from=build-dep /opt/ruby /opt/ruby +COPY --from=build-dep --link /opt/node /opt/node +COPY --from=build-dep --link /opt/ruby /opt/ruby # Add more PATHs to the PATH ENV PATH="${PATH}:/opt/ruby/bin:/opt/node/bin:/opt/mastodon/bin" |