From 9aabc3d26747c9d0e0d5f11011bf5c280ea4b63a Mon Sep 17 00:00:00 2001 From: Drew Larson Date: Sun, 15 Jan 2017 21:08:23 -0600 Subject: [PATCH 1/5] Install bower stuff. --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index b36c0ae..1a04e9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,8 @@ ADD bikeshop_project /code COPY requirements /code/requirements RUN pip install -r requirements/production.txt RUN npm cache clean +RUN npm install bower -g +RUN bower install RUN npm install --unsafe-perm RUN npm run build-production RUN DJANGO_SETTINGS_MODULE=bikeshop.settings.production python manage.py collectstatic --no-input From bb6627b788d6d59a60ee144183187c69c6ac8209 Mon Sep 17 00:00:00 2001 From: Drew Larson Date: Sun, 15 Jan 2017 21:15:25 -0600 Subject: [PATCH 2/5] Bower stuff. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1a04e9e..4a91bb2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,8 +9,8 @@ ADD bikeshop_project /code COPY requirements /code/requirements RUN pip install -r requirements/production.txt RUN npm cache clean -RUN npm install bower -g -RUN bower install +RUN npm install --unsafe-perm -g bower +RUN bower install --allow-root RUN npm install --unsafe-perm RUN npm run build-production RUN DJANGO_SETTINGS_MODULE=bikeshop.settings.production python manage.py collectstatic --no-input From 0347e75be038d3814c4dcd804ace5e603fdd46b1 Mon Sep 17 00:00:00 2001 From: Drew Larson Date: Sun, 15 Jan 2017 21:23:56 -0600 Subject: [PATCH 3/5] Copy bower. --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 4a91bb2..40a361b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,7 @@ COPY requirements /code/requirements RUN pip install -r requirements/production.txt RUN npm cache clean RUN npm install --unsafe-perm -g bower +COPY bower.json /code/bower.json RUN bower install --allow-root RUN npm install --unsafe-perm RUN npm run build-production From ed28e8ae40ae58c5611355407eab5fdd2d1e9c91 Mon Sep 17 00:00:00 2001 From: Drew Larson Date: Sun, 15 Jan 2017 21:43:58 -0600 Subject: [PATCH 4/5] Update bower stuff. --- .bowerrc | 3 --- bikeshop_project/.bowerrc | 3 +++ bower.json => bikeshop_project/bower.json | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 .bowerrc create mode 100644 bikeshop_project/.bowerrc rename bower.json => bikeshop_project/bower.json (92%) diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index 7d4de04..0000000 --- a/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory": "bikeshop_project/vendor" -} \ No newline at end of file diff --git a/bikeshop_project/.bowerrc b/bikeshop_project/.bowerrc new file mode 100644 index 0000000..4dece5f --- /dev/null +++ b/bikeshop_project/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory": "vendor" +} \ No newline at end of file diff --git a/bower.json b/bikeshop_project/bower.json similarity index 92% rename from bower.json rename to bikeshop_project/bower.json index 63a43fb..5163b81 100644 --- a/bower.json +++ b/bikeshop_project/bower.json @@ -9,7 +9,6 @@ "license": "MIT", "homepage": "", "private": true, - "directory": "bikeshop_project/vendor", "ignore": [ "**/.*", "node_modules", From dd9e24b349363a2bb885d00f0308e217125b932e Mon Sep 17 00:00:00 2001 From: Drew Larson Date: Sun, 15 Jan 2017 21:44:43 -0600 Subject: [PATCH 5/5] Use new bower config. --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 40a361b..4a91bb2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,6 @@ COPY requirements /code/requirements RUN pip install -r requirements/production.txt RUN npm cache clean RUN npm install --unsafe-perm -g bower -COPY bower.json /code/bower.json RUN bower install --allow-root RUN npm install --unsafe-perm RUN npm run build-production