gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #12001 from vector-im/jryans/bash-docker 

Use bash in Docker scripts
This commit is contained in:
J. Ryan Stinnett 2020-01-22 17:48:57 +00:00 committed by GitHub
parent 1b8ea4b6d7 b6963d0e5c
commit d7e47841e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y git dos2unix
WORKDIR /src WORKDIR /src
COPY . /src COPY . /src
RUN dos2unix /src/scripts/docker-link-repos.sh && sh /src/scripts/docker-link-repos.sh RUN dos2unix /src/scripts/docker-link-repos.sh && bash /src/scripts/docker-link-repos.sh
RUN yarn --network-timeout=100000 install RUN yarn --network-timeout=100000 install
RUN yarn build RUN yarn build
@ -22,7 +22,7 @@ RUN yarn build
RUN cp /src/config.sample.json /src/webapp/config.json RUN cp /src/config.sample.json /src/webapp/config.json
# Ensure we populate the version file # Ensure we populate the version file
RUN dos2unix /src/scripts/docker-write-version.sh && sh /src/scripts/docker-write-version.sh RUN dos2unix /src/scripts/docker-write-version.sh && bash /src/scripts/docker-write-version.sh
# App # App

2
scripts/docker-link-repos.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
set -ex set -ex

2
scripts/docker-write-version.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
set -ex set -ex