redockerize and deproxify

cookiecutter.json

@@ -1,6 +1,7 @@
 {
   "project_title": "DigHum Pro",
   "slug": "{{cookiecutter.project_title | lower | replace('-', '') | replace(' ', '_')}}",
+  "npm_slug": "{{cookiecutter.slug | replace('_', '-')}}",
   "app_prefix": "dh",
   "description": "{{cookiecutter.project_title}} will humanize all your digits!",
   "author": "Research Software Lab, Centre for Digital Humanities, Utrecht University",

hooks/post_gen_project.py

@@ -35,71 +35,6 @@ def python_path():
 
 def main(argv):
     print('\nFiles generated. Performing final steps.')
-    try:
-        activate_frontend()
-    except Exception as exception:
-        print(exception)
-        print("[ERROR] Activating frontend failed!!")
-    if '{{cookiecutter.frontend}}' == 'backbone' and not generate_backbone_translations(): return 1
-    venv = create_virtualenv()
-    pip_tools = backreq = backpack = clone_req = funcreq = funcpack = False
-    if venv:
-        adopt_virtualenv(VIRTUALENV)
-        pip_tools = install_pip_tools()
-        if pip_tools:
-            check_version_pip()
-            check_version_pip_compile()
-            backreq = compile_backend_requirements()
-            if backreq:
-                backpack = install_backend_packages()
-                clone_req = copy_backreq_to_func()
-                if clone_req:
-                    funcreq = compile_functest_requirements()
-                    if funcreq:
-                        funcpack = install_functest_packages()
-    frontpack = install_frontend_packages()
-    git = setup_git()
-    gitflow = develop = stage = commit = remote = False
-    if git:
-        gitflow = setup_gitflow()
-        if not gitflow:
-            develop = create_develop_branch()
-        if funcreq and frontpack:
-            stage = git_add()
-            if stage:
-                commit = initial_commit()
-        remote = add_remote()
-    db = create_db()
-    if db:
-        db = grant_db()
-    migrate = superuser = False
-    if db and backpack:
-        migrate = run_migrations()
-        if migrate:
-            superuser = create_superuser()
-    if not all([superuser, remote, commit, gitflow, funcpack]):
-        print('\nPlease read {} for information on failed commands.'.format(LOGFILE_NAME))
-    print('\nAlmost ready to go! Just a couple more commands to run:')
-    print(cd_into_project)
-    if not venv: print(create_virtualenv)
-    print(activate_venv)
-    if not pip_tools: print(install_pip_tools)
-    if not backreq: print(compile_backend_requirements)
-    if not clone_req: print(copy_backreq_to_func)
-    if not funcreq: print(compile_functest_requirements)
-    if not (backpack and frontpack and funcpack): print(install_all_packages)
-    if not git: print(setup_git)
-    if not gitflow and not develop: print(create_develop_branch)
-    if not stage: print(git_add)
-    if not commit: print(initial_commit)
-    if not remote: print(add_remote)
-    if not db:
-        print(create_db)
-        print(grant_db)
-    if not migrate: print(run_migrations)
-    if not superuser: print(create_superuser)
-    print(git_push)
-    print(yarn_start)
 
 
 def generate_backbone_translations():
@@ -121,6 +56,11 @@ def generate_backbone_translations():
     return True
 
 
+bootstrap_subprojects = Command(
+    'Finalize subproject package configuration',
+    ['docker', 'compose', '-f', 'compose-postgenerate.yml', 'up']
+)
+
 cd_into_project = Command('', ['cd', SLUG])
 
 create_virtualenv = make_create_venv_command(VIRTUALENV_COMMAND)

{{cookiecutter.slug}}/backend/Dockerfile-postgenerate

@@ -0,0 +1,7 @@
+FROM python:3.9
+
+WORKDIR /usr/src/app/backend
+COPY requirements.in .
+RUN pip install -U pip pip-tools
+
+CMD pip-compile

{{cookiecutter.slug}}/bootstrap.py

@@ -191,110 +191,23 @@ def make_access_db_command(psql_cmd):
     )
 
 
-def merge_json(target, source):
-    for key, value in source.items():
-        if value is None:
-            del target[key]
-        elif key in target and isinstance(target[key], dict) and \
-                isinstance(source[key], dict):
-            merge_json(target[key], source[key])
-        else:
-            target[key] = value
-    return target
-
-
 def activate_frontend():
     framework = '{{cookiecutter.frontend}}'
-    os.rename('package.{{cookiecutter.frontend}}.json', 'package.json')
 
     if framework == 'backbone':
         os.rename('frontend.backbone', 'frontend')
         shutil.move(op.join('frontend', 'proxy.json'), 'proxy.json')
-        override_json('package')
     elif framework == 'angular':
-        project_name = '{{cookiecutter.slug}}'.replace('_', '-')
-        Command(
-            'Install dependencies',
-            ['yarn', 'install', '--ignore-scripts']
-        )()
-        Command(
-            'Creating project',
-            ['yarn', 'ng', 'new', project_name, '--prefix={{cookiecutter.app_prefix}}',
-                '--ssr',
-                '--skip-git=true',
-                '--skip-install=true',
-                '--package-manager=yarn',
-                '--style=scss',
-                '--routing=true']
-        )()
-        shutil.copytree('frontend.angular', project_name, dirs_exist_ok=True)
-        os.rename(project_name, 'frontend')
         shutil.move(op.join('frontend', 'proxy.conf.json'), 'proxy.conf.json')
-        override_json('package')
-        Command(
-            'Install frontend dependencies using Yarn',
-            ['yarn'],
-            cwd="frontend"
-        )()
-        # Remove favicon.ico
-        os.remove(os.path.join('frontend', 'src', 'favicon.ico'))
-        # Remove editorconfig
-        os.remove(os.path.join('frontend', '.editorconfig'))
-        Command(
-            'ng add @angular/localize',
-            ['yarn', 'ng', 'add', '@angular/localize', '--skip-confirmation'],
-            cwd="frontend"
-        )()
-
-        override_json('angular')
-        Command(
-            'Creating localizations',
-            ['yarn', 'i18n'],
-            cwd="frontend"
-        )()
-        for lang in '{{cookiecutter.localizations}}'.split(','):
-            [code, lang_name] = lang.split(':')
-            with open(f'frontend/locale/messages.xlf', 'r') as file:
-                messages = file.read()
-            if code != '{{cookiecutter.default_localization}}':
-                with open(f'frontend/locale/messages.{code}.xlf', 'w') as file:
-                    # add the target-language attribute after the source-language attribute
-                    targeted = re.sub(r'(source-language="[^"]+"[^>]*)', f'\\g<1> target-language="{code}"', messages)
-                    try:
-                        with open(f'frontend/locale/messages.{code}.json', 'r') as pretranslated:
-                            translations = json.load(pretranslated)
-                            for key, value in translations.items():
-                                targeted = targeted.replace(f'<source>{key}</source>', f'<source>{key}</source>\n        <target state="translated">{value}</target>')
-                        os.remove(f'frontend/locale/messages.{code}.json')
-                    except FileNotFoundError:
-                        pass
-                    file.write(targeted)
-        if '{{cookiecutter.frontend_port}}' != '4200':
-            Command(
-                'Set frontend port',
-                ['yarn', 'ng', 'config', "projects.{{cookiecutter.slug | replace('_', '-')}}.architect.serve.options.port", '{{cookiecutter.frontend_port}}'],
-                cwd="frontend"
-            )()
     else:
         print('Unknown framework {{cookiecutter.frontend}} specified!')
     # remove other frameworks
     for path in glob.glob("frontend.*"):
         shutil.rmtree(path)
     for path in glob.glob("package.*.json"):
         os.remove(path)
-
-
-def override_json(filename):
-    if os.path.isfile(f'frontend/{filename}.overwrite.json'):
-        print(f'Overriding {filename}.json')
-        with open(f'frontend/{filename}.overwrite.json', 'r') as file:
-            overwrite = json.load(file)
-        with open(f'frontend/{filename}.json', 'r') as file:
-            data = json.load(file)
-        with open(f'frontend/{filename}.json', 'w') as file:
-            merge_json(data, overwrite)
-            json.dump(data, file, indent=4)
-        os.remove(f'frontend/{filename}.overwrite.json')
+    os.remove(op.join('frontend', 'Dockerfile-postgenerate'))
+    shutil.rmtree(op.join('frontend', 'bootstrap'))
 
 
 install_pip_tools = Command(

{{cookiecutter.slug}}/compose-postgenerate.yml

@@ -0,0 +1,17 @@
+services:
+    backend:
+        build:
+            context: ./backend
+            dockerfile: Dockerfile-postgenerate
+        volumes:
+            - ./backend:/usr/src/app/backend
+    frontend:
+        build:
+            context: ./frontend.{{cookiecutter.frontend}}
+            dockerfile: Dockerfile-postgenerate
+        volumes:
+            - ./frontend:/usr/src/app/frontend
+            - frnomo:/usr/src/app/frontend/node_modules
+
+volumes:
+    frnomo:

{{cookiecutter.slug}}/frontend.angular/Dockerfile-postgenerate

@@ -0,0 +1,47 @@
+FROM node:18 AS bootstrap-1
+
+WORKDIR /usr/src/app
+RUN yarn init -yp && \
+    yarn add "@angular/cli@17" && \
+    yarn ng new {{cookiecutter.npm_slug}} \
+        --prefix={{cookiecutter.app_prefix}} \
+        --ssr \
+        --skip-git=true \
+        --skip-install=true \
+        --package-manager=yarn \
+        --style=scss \
+        --routing=true
+
+WORKDIR /usr/src/app/{{cookiecutter.npm_slug}}
+COPY . .
+
+FROM python:3.9 AS bootstrap-2
+
+WORKDIR /usr/src/app
+COPY --from=bootstrap-1 \
+     /usr/src/app/{{cookiecutter.npm_slug}} frontend/
+
+WORKDIR /usr/src/app/frontend
+RUN python bootstrap/override_json.py package
+
+FROM node:18 AS bootstrap-3
+
+WORKDIR /usr/src/app/frontend
+RUN rm src/favicon.ico .editorconfig && \
+    yarn && \
+    yarn ng add @angular/localize --skip-confirmation
+
+FROM python:3.9 AS bootstrap-4
+
+WORKDIR /usr/src/app/frontend
+RUN python bootstrap/override_json.py angular
+
+FROM node:18 AS bootstrap-5
+
+WORKDIR /usr/src/app/frontend
+RUN yarn ng extract-i18n --output-path locale
+
+FROM python:3.9 AS bootstrap-6
+
+WORKDIR /usr/src/app/frontend
+RUN python bootstrap/finish_localizations.py

{{cookiecutter.slug}}/frontend.angular/bootstrap/finish_localizations.py

@@ -0,0 +1,27 @@
+import re
+import json
+import os
+
+
+def main():
+    for lang in '{{cookiecutter.localizations}}'.split(','):
+        [code, lang_name] = lang.split(':')
+        with open(f'locale/messages.xlf', 'r') as file:
+            messages = file.read()
+        if code != '{{cookiecutter.default_localization}}':
+            with open(f'locale/messages.{code}.xlf', 'w') as file:
+                # add the target-language attribute after the source-language attribute
+                targeted = re.sub(r'(source-language="[^"]+"[^>]*)', f'\\g<1> target-language="{code}"', messages)
+                try:
+                    with open(f'locale/messages.{code}.json', 'r') as pretranslated:
+                        translations = json.load(pretranslated)
+                        for key, value in translations.items():
+                            targeted = targeted.replace(f'<source>{key}</source>', f'<source>{key}</source>\n        <target state="translated">{value}</target>')
+                            os.remove(f'locale/messages.{code}.json')
+                except FileNotFoundError:
+                    pass
+                file.write(targeted)
+
+
+if __name__ == '__main__':
+    main()

{{cookiecutter.slug}}/frontend.angular/bootstrap/override_json.py

@@ -0,0 +1,31 @@
+import os
+import sys
+
+
+def merge_json(target, source):
+    for key, value in source.items():
+        if value is None:
+            del target[key]
+        elif key in target and isinstance(target[key], dict) and \
+                isinstance(source[key], dict):
+            merge_json(target[key], source[key])
+        else:
+            target[key] = value
+    return target
+
+
+def override_json(filename):
+    if os.path.isfile(f'{filename}.overwrite.json'):
+        print(f'Overriding {filename}.json')
+        with open(f'{filename}.overwrite.json', 'r') as file:
+            overwrite = json.load(file)
+        with open(f'{filename}.json', 'r') as file:
+            data = json.load(file)
+        with open(f'{filename}.json', 'w') as file:
+            merge_json(data, overwrite)
+            json.dump(data, file, indent=4)
+        os.remove(f'{filename}.overwrite.json')
+
+
+if __name__ == '__main__':
+    override_json(sys.argv[1])