Skip to content

Commit

Permalink
Merge pull request #12001 from vector-im/jryans/bash-docker
Browse files Browse the repository at this point in the history
Use bash in Docker scripts
  • Loading branch information
jryans authored Jan 22, 2020
2 parents 1b8ea4b + b6963d0 commit d7e4784
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ RUN apt-get update && apt-get install -y git dos2unix
WORKDIR /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 build

# 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

# 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
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker-link-repos.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash

set -ex

Expand Down
2 changes: 1 addition & 1 deletion scripts/docker-write-version.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash

set -ex

Expand Down

0 comments on commit d7e4784

Please sign in to comment.