Skip to content

Commit 417db4c

Browse files
authored
Docker: remove redundant dos2unix calls (#28839)
I'm assuming these were here because, at some point, someone checked in some files with CRLF line endings. However, they are no longer there, installing dos2unix slows down the build, and just don't do that, m'kay?
1 parent 4e151f8 commit 417db4c

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

Dockerfile

+2-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@ ARG USE_CUSTOM_SDKS=false
66
ARG JS_SDK_REPO="https://github.com/matrix-org/matrix-js-sdk.git"
77
ARG JS_SDK_BRANCH="master"
88

9-
RUN apt-get update && apt-get install -y git dos2unix
10-
119
WORKDIR /src
1210

1311
COPY . /src
14-
RUN dos2unix /src/scripts/docker-link-repos.sh && bash /src/scripts/docker-link-repos.sh
12+
RUN /src/scripts/docker-link-repos.sh
1513
RUN yarn --network-timeout=200000 install
16-
17-
RUN dos2unix /src/scripts/docker-package.sh /src/scripts/get-version-from-git.sh /src/scripts/normalize-version.sh && bash /src/scripts/docker-package.sh
14+
RUN /src/scripts/docker-package.sh
1815

1916
# Copy the config now so that we don't create another layer in the app image
2017
RUN cp /src/config.sample.json /src/webapp/config.json

0 commit comments

Comments
 (0)