Skip to content

Commit 064432c

Browse files
authored
chore: bring docker dev init script up to date with bs5 branch (ietf-tools#3611)
1 parent 0f1bd8f commit 064432c

5 files changed

Lines changed: 283 additions & 911 deletions

File tree

.devcontainer/docker-compose.extend.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ services:
77
DJANGO_SETTINGS_MODULE: settings_local_sqlitetest
88
volumes:
99
- ..:/root/src
10+
- /root/src/node_modules
1011
# Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
1112
network_mode: service:db

docker/docker-compose.extend.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ services:
55
ports:
66
- '8000:8000'
77
volumes:
8-
- ..:/root/src
8+
- ..:/root/src
9+
- /root/src/node_modules
910
db:
1011
ports:
1112
- '3306'

docker/scripts/app-init.sh

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,17 @@ WORKSPACEDIR="/root/src"
44

55
service rsyslog start
66

7+
# Generate static assets
8+
9+
npm install
10+
echo "Building static assets... (this could take a minute or two)"
11+
cd bootstrap
12+
npm install -g grunt-cli
13+
npm install
14+
grunt dist
15+
cp -r dist/. ../ietf/static/ietf/bootstrap/
16+
cd ..
17+
718
# Copy config files if needed
819

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

4253
# Create assets directories
4354

44-
for sub in \
55+
for sub in \
4556
test/id \
4657
test/staging \
4758
test/archive \
4859
test/rfc \
4960
test/media \
5061
test/wiki/ietf \
51-
data/nomcom_keys/public_keys \
52-
data/developers/ietf-ftp \
53-
data/developers/ietf-ftp/bofreq \
54-
data/developers/ietf-ftp/charter \
55-
data/developers/ietf-ftp/conflict-reviews \
56-
data/developers/ietf-ftp/internet-drafts \
57-
data/developers/ietf-ftp/rfc \
58-
data/developers/ietf-ftp/status-changes \
59-
data/developers/ietf-ftp/yang/catalogmod \
60-
data/developers/ietf-ftp/yang/draftmod \
61-
data/developers/ietf-ftp/yang/ianamod \
62-
data/developers/ietf-ftp/yang/invalmod \
63-
data/developers/ietf-ftp/yang/rfcmod \
64-
data/developers/www6s \
65-
data/developers/www6s/staging \
66-
data/developers/www6s/wg-descriptions \
67-
data/developers/www6s/proceedings \
68-
data/developers/www6/ \
69-
data/developers/www6/iesg \
70-
data/developers/www6/iesg/evaluation \
62+
data/nomcom_keys/public_keys \
63+
data/developers/ietf-ftp \
64+
data/developers/ietf-ftp/bofreq \
65+
data/developers/ietf-ftp/charter \
66+
data/developers/ietf-ftp/conflict-reviews \
67+
data/developers/ietf-ftp/internet-drafts \
68+
data/developers/ietf-ftp/rfc \
69+
data/developers/ietf-ftp/status-changes \
70+
data/developers/ietf-ftp/yang/catalogmod \
71+
data/developers/ietf-ftp/yang/draftmod \
72+
data/developers/ietf-ftp/yang/ianamod \
73+
data/developers/ietf-ftp/yang/invalmod \
74+
data/developers/ietf-ftp/yang/rfcmod \
75+
data/developers/www6s \
76+
data/developers/www6s/staging \
77+
data/developers/www6s/wg-descriptions \
78+
data/developers/www6s/proceedings \
79+
data/developers/www6/ \
80+
data/developers/www6/iesg \
81+
data/developers/www6/iesg/evaluation \
82+
data/developers/media/photo \
7183
; do
7284
dir="/root/src/$sub"
7385
if [ ! -d "$dir" ]; then

ietf/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
/*.pyc
22
/settings_local.py
3+
/settings_local_debug.py
4+
/settings_local_sqlitetest.py
35
/ietfdb.sql.gz

0 commit comments

Comments
 (0)