Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .devcontainer/docker-compose.extend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ services:
DJANGO_SETTINGS_MODULE: settings_local_sqlitetest
volumes:
- ..:/root/src
- /root/src/node_modules
# Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
network_mode: service:db
3 changes: 2 additions & 1 deletion docker/docker-compose.extend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ services:
ports:
- '8000:8000'
volumes:
- ..:/root/src
- ..:/root/src
- /root/src/node_modules
db:
ports:
- '3306'
54 changes: 33 additions & 21 deletions docker/scripts/app-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ WORKSPACEDIR="/root/src"

service rsyslog start

# Generate static assets

npm install
echo "Building static assets... (this could take a minute or two)"
cd bootstrap
npm install -g grunt-cli
npm install
grunt dist
cp -r dist/. ../ietf/static/ietf/bootstrap/
cd ..

# Copy config files if needed

if [ ! -f "$WORKSPACEDIR/ietf/settings_local.py" ]; then
Expand Down Expand Up @@ -41,33 +52,34 @@ fi

# Create assets directories

for sub in \
for sub in \
test/id \
test/staging \
test/archive \
test/rfc \
test/media \
test/wiki/ietf \
data/nomcom_keys/public_keys \
data/developers/ietf-ftp \
data/developers/ietf-ftp/bofreq \
data/developers/ietf-ftp/charter \
data/developers/ietf-ftp/conflict-reviews \
data/developers/ietf-ftp/internet-drafts \
data/developers/ietf-ftp/rfc \
data/developers/ietf-ftp/status-changes \
data/developers/ietf-ftp/yang/catalogmod \
data/developers/ietf-ftp/yang/draftmod \
data/developers/ietf-ftp/yang/ianamod \
data/developers/ietf-ftp/yang/invalmod \
data/developers/ietf-ftp/yang/rfcmod \
data/developers/www6s \
data/developers/www6s/staging \
data/developers/www6s/wg-descriptions \
data/developers/www6s/proceedings \
data/developers/www6/ \
data/developers/www6/iesg \
data/developers/www6/iesg/evaluation \
data/nomcom_keys/public_keys \
data/developers/ietf-ftp \
data/developers/ietf-ftp/bofreq \
data/developers/ietf-ftp/charter \
data/developers/ietf-ftp/conflict-reviews \
data/developers/ietf-ftp/internet-drafts \
data/developers/ietf-ftp/rfc \
data/developers/ietf-ftp/status-changes \
data/developers/ietf-ftp/yang/catalogmod \
data/developers/ietf-ftp/yang/draftmod \
data/developers/ietf-ftp/yang/ianamod \
data/developers/ietf-ftp/yang/invalmod \
data/developers/ietf-ftp/yang/rfcmod \
data/developers/www6s \
data/developers/www6s/staging \
data/developers/www6s/wg-descriptions \
data/developers/www6s/proceedings \
data/developers/www6/ \
data/developers/www6/iesg \
data/developers/www6/iesg/evaluation \
data/developers/media/photo \
; do
dir="/root/src/$sub"
if [ ! -d "$dir" ]; then
Expand Down
2 changes: 2 additions & 0 deletions ietf/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/*.pyc
/settings_local.py
/settings_local_debug.py
/settings_local_sqlitetest.py
/ietfdb.sql.gz
Loading