chore(ci): backend docker

.github/workflows/pr-open.yml

@@ -16,11 +16,15 @@ jobs:
     strategy:
       matrix:
         package: [database, backend, frontend, minio]
+        include:
+          - package: backend
+            build_conext: ./
     timeout-minutes: 20
     steps:
       - uses: bcgov-nr/[email protected]
         with:
           keep_versions: 50
+          build_context: ${{ matrix.build_context }}
           package: ${{ matrix.package }}
           tag: ${{ github.event.number }}
           tag_fallback: latest

backend/Dockerfile

@@ -1,3 +1,22 @@
+FROM node:14.21.3 AS frontend
+
+ENV LOG_LEVEL="info"
+
+RUN apt update && \
+    apt install -y git build-essential python3 python3-pip make g++ && \
+    apt autoremove -y && \
+    apt clean
+
+WORKDIR /app
+
+COPY ./frontend/package*.json ./
+
+RUN npm install
+
+COPY ./frontend/ /app
+
+RUN npm run build
+
 FROM python:3.7-slim
 
 # Envars
@@ -60,9 +79,12 @@
 RUN python3 -m pip install ptvsd
 RUN python3 -m pip install 'setuptools<58.0'
 
-COPY . /app
+COPY ./backend /app
 # COPY ./backend-command-script.sh /backend-command-script.sh
-COPY ./requirements.txt /requirements.txt
+COPY ./backend/requirements.txt /app/requirements.txt
+
+COPY --from=frontend ./app/dist ./gwells/static
+COPY --from=frontend ./app/dist/index.html ./gwells/templates/
 
 # RUN chmod +x load_fixtures.sh works when i pull the dockerfile into backend but not when dockerfile is with other docker files
 RUN chmod +x /app
@@ -71,48 +93,11 @@
 
 RUN python3 -m pip install -r requirements.txt
 
-
 # TODO: move to entrypoint in deployment template?
 # chmod -R 777 /app && \
 CMD sh -c "python3 manage.py migrate --noinput && \
     ./load_fixtures.sh all && \
     python3 manage.py createinitialrevisions && \
-    # python3 manage.py collectstatic --noinput && \
+    python3 manage.py collectstatic --noinput && \
     # python3 manage.py export --cleanup=1 --upload=1 && \
     python3 manage.py runserver 0.0.0.0:8000"
-
-# RUN mkdir -p /app/staticfiles/admin/css && \
-#     ln -s /app/staticfiles /tmp/staticfiles && \
-#     chmod -R 777 /app/staticfiles
-
-# make script executable
-# RUN chmod +x /backend/backend-command-script.sh
-
-# production image step
-# FROM python:3.7-slim
-
-# # TODO: need to confirm version of libgdal-dev used with FROM python version
-# RUN apt-get -y update && \
-#     apt-get -y install libgdal32 \
-#     gdal-bin
-
-# ENV PATH="/usr/bin/python3:${PATH}"
-
-# WORKDIR /app
-
-# RUN python3 -m pip install 'setuptools<58.0'
-# RUN python3 -m pip install --upgrade pip
-# RUN python3 -m pip install ptvsd
-
-# COPY --from=build /app /app
-# COPY --from=build /backend-command-script.sh /backend-command-script.sh
-# COPY --from=build /requirements.txt /requirements.txt
-
-# RUN chmod +x /app
-
-# RUN python3 -m pip install -r requirements.txt
-
-# make script executable
-# RUN chmod +x /backend/backend-command-script.sh
-
-# CMD ["python3", "manage.py", "runserver", "0.0.0.0:8000"]

backend/gwells/settings/__init__.py

@@ -100,13 +100,13 @@
 
 # Application definition
 INSTALLED_APPS = (
-    # 'whitenoise.runserver_nostatic',
+    'whitenoise.runserver_nostatic',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
-    # 'django.contrib.staticfiles',
+    'django.contrib.staticfiles',
     'debug_toolbar',
     'django.contrib.postgres',
     'rest_framework',
@@ -129,7 +129,7 @@
 MIDDLEWARE = (
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.security.SecurityMiddleware',
-    # 'whitenoise.middleware.WhiteNoiseMiddleware',
+    'whitenoise.middleware.WhiteNoiseMiddleware',
     'django.middleware.gzip.GZipMiddleware',
     'debug_toolbar.middleware.DebugToolbarMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -198,17 +198,17 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.8/howto/static-files/
 
-# if APP_CONTEXT_ROOT:
-#     STATIC_URL = '/' + APP_CONTEXT_ROOT + '/'
-# else:
-#     STATIC_URL = '/'
+if APP_CONTEXT_ROOT:
+    STATIC_URL = '/' + APP_CONTEXT_ROOT + '/'
+else:
+    STATIC_URL = '/'
 
-# STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
+STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
 
-# STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
-# STATICFILES_DIR = (
-#     os.path.join(BASE_DIR, 'staticfiles')
-# )
+STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
+STATICFILES_DIR = (
+    os.path.join(BASE_DIR, 'staticfiles')
+)
 
 LOGGING = {
     'version': 1,
@@ -344,5 +344,5 @@ def __getitem__(self, item):
 if get_env_variable('DISABLE_MIGRATIONS', None, strict=False, warn=False) == 'DISABLE_MIGRATIONS':
     MIGRATION_MODULES = DisableMigrations()
 
-# WHITENOISE_INDEX_FILE = True
+WHITENOISE_INDEX_FILE = True
 APPEND_SLASH = True

backend/gwells/urls.py

@@ -24,7 +24,7 @@
 from django.shortcuts import redirect
 from django.views.decorators.cache import never_cache 
 
-from gwells.views import SurveyListCreateView, SurveyUpdateDeleteView, HealthView, api
+from gwells.views import SurveyListCreateView, SurveyUpdateDeleteView, HealthView, index, api
 from gwells.views.bulk import BulkWellAquiferCorrelation, BulkVerticalAquiferExtents
 from gwells.views.admin import *
 from gwells.settings.base import get_env_variable
@@ -101,6 +101,6 @@ def api_path_prefix():
     # Catch all other cases to api/ and 404 them
     re_path(r'' + app_root_slash + api_path_prefix() + '/*', api.api_404, name='api-404'),
 
-    # # Catch all other cases and push it to the SPA
-    # re_path(r'' + app_root_slash + '*', index, name='spa'),
+    # Catch all other cases and push it to the SPA
+    re_path(r'' + app_root_slash + '*', index, name='spa'),
 ]

backend/gwells/views/__init__.py

@@ -103,8 +103,8 @@ def get_queryset(self):
         return super().get_queryset()
 
 
-# @require_http_methods(["GET"])
-# def index(request, **kwargs):
-#     # Serve up the index.html generated by vue as a template.
-#     # This is not ideal, consider switching serving up of Vue.js entirely to caddy.
-#     return render(request, 'index.html')
+@require_http_methods(["GET"])
+def index(request, **kwargs):
+    # Serve up the index.html generated by vue as a template.
+    # This is not ideal, consider switching serving up of Vue.js entirely to caddy.
+    return render(request, 'index.html')

backend/requirements.txt

@@ -12,7 +12,7 @@ django-crispy-forms==2.0
 django-formtools==2.4.1
 django-filter==23.5
 requests==2.27.1
-# whitenoise==6.5.0
+whitenoise==6.5.0
 django-cors-headers==4.1.0
 django-extensions==3.2.3
 django-rest-multiple-models==2.1.3

docker-compose.yml

@@ -189,10 +189,11 @@ services:
 #############################################################################################
   backend:
     platform: linux/x86_64
-    working_dir: /backend
+    # working_dir: /backend
     build:
-      context: ./backend
-      dockerfile: Dockerfile
+      context: ./
+      dockerfile: ./backend/Dockerfile
+    image: nr-gwells/backend:latest
     hostname: backend
     # env_file:
     # - path: ./.env.test
@@ -245,8 +246,8 @@ services:
       GEOCODER_ADDRESS_API_BASE: https://geocoder.api.gov.bc.ca/addresses.json?
       LOCAL: "true"
       LOAD_FIXTURES: "true"
-    volumes:
-      - ./backend:/backend
+    # volumes:
+    #   - ./backend:/backend
     healthcheck:
       test: timeout 3s bash -c 'true > /dev/tcp/127.0.0.1/8000'
       interval: 5s

frontend/src/router.js

@@ -50,8 +50,9 @@ Vue.use(Router)
 
 const router = new Router({
   mode: 'history',
-  base: '/',
-  component: WellSearch,
+  // base: '/',
+  // component: WellSearch,
+  base: '/gwells/',
   routes: [
     // aquifers routes
     {

frontend/vue.config.js

@@ -5,8 +5,8 @@ if (process.env.API_TARGET) {
 module.exports = {
   lintOnSave: false,
   runtimeCompiler: true,
-  // publicPath: process.env.NODE_ENV === 'production' ? '/gwells/' : '/',
-  publicPath: '/',
+  publicPath: process.env.NODE_ENV === 'production' ? '/gwells/' : '/',
+  // publicPath: '/',
   configureWebpack: {
     resolve: {
       alias: {