Skip to content

Commit

Permalink
Merge pull request #27905 from element-hq/travis/docker-win
Browse files Browse the repository at this point in the history
dos2unix more Docker scripts
  • Loading branch information
turt2live authored Aug 7, 2024
2 parents ccb3922 + 3f4ae73 commit 1e3c145
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ COPY . /src
RUN dos2unix /src/scripts/docker-link-repos.sh && bash /src/scripts/docker-link-repos.sh
RUN yarn --network-timeout=200000 install

RUN dos2unix /src/scripts/docker-package.sh && bash /src/scripts/docker-package.sh
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

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

0 comments on commit 1e3c145

Please sign in to comment.