Revision 1574:7b23adecd963 extra/soundsoftware/dockertest

View differences:

extra/soundsoftware/dockertest/Dockerfile
67 67
WORKDIR /var/www/code
68 68

  
69 69

  
70
# Set up database config etc (todo: insert variables)
70
# Set up database config etc
71 71

  
72
RUN cp extra/soundsoftware/dockertest/database.yml config/database.yml
72
RUN cp extra/soundsoftware/dockertest/database.yml.interpolated config/database.yml
73 73

  
74 74

  
75 75
# Install Rails and dependencies (database.yml must be populated before this)
......
109 109
RUN ln -s ../mods-available/expires.load    /etc/apache2/mods-enabled/
110 110
RUN ln -s ../mods-available/rewrite.load    /etc/apache2/mods-enabled/
111 111

  
112
RUN cp extra/soundsoftware/dockertest/code.conf /etc/apache2/sites-available/
112
RUN cp extra/soundsoftware/dockertest/code.conf.interpolated /etc/apache2/sites-available/code.conf
113 113
RUN ln -s ../sites-available/code.conf /etc/apache2/sites-enabled/10-code.conf
114 114

  
115 115
RUN apache2ctl configtest
extra/soundsoftware/dockertest/start.sh
1 1
#!/bin/bash
2 2

  
3
dbpwd="$1"
4
if [ -z "$dbpwd" ]; then
5
    echo "Usage: $0 <database-password>" 1>&2
6
    exit 2
7
fi
8

  
3 9
set -eu
4 10

  
5 11
dockerdir=./extra/soundsoftware/dockertest
......
8 14
    exit 2
9 15
fi
10 16

  
17
for f in database.yml code.conf ; do
18
    cat "$dockerdir/$f" |
19
        sed 's/INSERT_POSTGRES_PASSWORD_HERE/'"$dbpwd"'/g' > \
20
            "$dockerdir/$f.interpolated"
21
done
22

  
11 23
dockertag="cannam/soundsoftware-site"
12 24

  
13 25
sudo docker build -t "$dockertag" -f "$dockerdir/Dockerfile" .

Also available in: Unified diff