Merge pull request #64 from BaseballCardTracker/35-static-files

35 static files

Author: codeguru42

.gitignore

@@ -1,5 +1,6 @@
 /venv/
 /.idea/
+/static/
 .env
 *.iml
 *.sqlite3

Dockerfile

@@ -10,6 +10,8 @@ RUN apt install -y curl
 
 # create user
 RUN useradd -ms /bin/bash bbct
+RUN mkdir -p /bbct/static
+RUN chown -R bbct /bbct
 USER bbct
 
 # install poetry

bbct/settings.py

@@ -137,4 +137,5 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/2.2/howto/static-files/
 
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 STATIC_URL = '/static/'

docker-compose.yml

@@ -10,12 +10,18 @@ services:
       - db
     env_file:
       - .env
+    volumes:
+      - static_files:/bbct/static
+
   nginx:
     build: ./nginx
     ports:
       - "8000:80"
     depends_on:
       - api
+    volumes:
+      - static_files:/static
+
   db:
     image: postgres:13.0-alpine
     volumes:
@@ -31,3 +37,4 @@ services:
 
 volumes:
   postgres_data:
+  static_files:

entrypoint.sh

@@ -12,5 +12,6 @@ then
 fi
 
 poetry run python manage.py migrate
+poetry run python manage.py collectstatic
 
 exec "$@"

nginx/nginx.conf

@@ -6,6 +6,10 @@ server {
 
     listen 80;
 
+    location /static {
+        root /;
+    }
+
     location / {
         proxy_pass http://bbct_api;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;