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,16 @@ def python_path():
 
 def main(argv):
     print('\nFiles generated. Performing final steps.')
+    boot_sup = bootstrap_subprojects()
+    if not boot_sup:
+        print(f'\nSubproject initialization failed. Please see {LOGFILE_NAME} for details.')
+        return 1
     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 +66,8 @@ def generate_backbone_translations():
     return True
 
 
+bootstrap_subprojects = make_bootstrap_command('bootstrap')
+
 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

@@ -205,83 +205,43 @@ def merge_json(target, source):
 
 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"
-            )()
+        # if not angular_bootstrap_2():
+        #     return false
+        # override_json('angular')
+        # if not angular_bootstrap_3():
+        #     return false
+        # 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)
+        # shutil.move(op.join('frontend', 'proxy.conf.json'), 'proxy.conf.json')
     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)
+    # for path in glob.glob("frontend.*"):
+    #     shutil.rmtree(path)
+    # for path in glob.glob("package.*.json"):
+    #     os.remove(path)
 
 
 def override_json(filename):
@@ -297,6 +257,19 @@ def override_json(filename):
         os.remove(f'frontend/{filename}.overwrite.json')
 
 
+def make_bootstrap_command(profile):
+    return Command(
+        f'Finalize subproject package configuration ({profile})',
+        ['docker', 'compose',
+         '-f', 'compose-postgenerate.yml',
+         '--profile', profile,
+         'up']
+    )
+
+
+angular_bootstrap_2 = make_bootstrap_command('bootstrap-2')
+angular_bootstrap_3 = make_bootstrap_command('bootstrap-3')
+
 install_pip_tools = Command(
     'Install pip-tools',
     ['yarn', 'preinstall'],

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

@@ -0,0 +1,37 @@
+services:
+    backend:
+        profiles: ['bootstrap']
+        build:
+            context: ./backend
+            dockerfile: Dockerfile-postgenerate
+        volumes:
+            - ./backend:/usr/src/app/backend
+    frontend:
+        profiles: ['bootstrap']
+        build:
+            context: ./frontend.{{cookiecutter.frontend}}
+            dockerfile: Dockerfile-postgenerate
+            {% if cookiecutter.frontend == 'angular' %}
+            target: bootstrap
+            {% endif %}
+        volumes: &frontend-volumes
+            - ./frontend:/usr/src/app/frontend
+            - frnomo:/usr/src/app/frontend/node_modules
+    {% if cookiecutter.frontend == 'angular' %}
+    frontend-2:
+        profiles: ['bootstrap-2']
+        build: &angular-staged-build
+            context: ./frontend
+            dockerfile: ../frontend.angular/Dockerfile-postgenerate
+            target: bootstrap-2
+        volumes: *frontend-volumes
+    frontend-3:
+        profiles: ['bootstrap-3']
+        build:
+            <<: *angular-staged-build
+            target: bootstrap-3
+        volumes: *frontend-volumes
+    {% endif %}
+
+volumes:
+    frnomo:

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

@@ -0,0 +1,39 @@
+FROM node:18 as bootstrap
+
+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 . .
+
+VOLUME /usr/src/app/frontend
+CMD cp package.json package.overwrite.json ../frontend/
+
+FROM bootstrap as bootstrap-2
+
+WORKDIR /usr/src/app/{{cookiecutter.npm_slug}}
+COPY package.json ./
+RUN rm src/favicon.ico .editorconfig && \
+    yarn && \
+    yarn ng add @angular/localize --skip-confirmation
+
+VOLUME /usr/src/app/frontend
+CMD cp angular.json angular.overwrite.json ../frontend/
+
+FROM bootstrap-2 as bootstrap-3
+
+WORKDIR /usr/src/app/{{cookiecutter.npm_slug}}
+COPY angular.json ./
+RUN yarn ng extract-i18n --output-path locale
+
+VOLUME /usr/src/app/frontend
+CMD cp -r * .* ../frontend/