v0.8.0rc1

.circleci/config.yml

@@ -1,122 +1,175 @@
 executors:
-  latest-image:
+  amd64-large-executor:
     machine:
-      image: ubuntu-2004:202111-01
+      image: ubuntu-2004:202111-02
+      docker_layer_caching: true
+      resource_class: large
+  amd64-medium-executor:
+    machine:
+      image: ubuntu-2004:202111-02
+      docker_layer_caching: true
+      resource_class: medium
+  amd64-small-executor:
+    machine:
+      image: ubuntu-2004:202111-02
+      docker_layer_caching: true
+      resource_class: small
+  arm64-medium-executor:
+    machine:
+      image: ubuntu-2004:202101-01
+      docker_layer_caching: true
+      resource_class: arm.medium
 jobs:
-  test-and-build-dist:
-    executor: latest-image
+  build-base-amd64: &build-base
+    executor: amd64-medium-executor
     steps:
       - checkout
       - run:
-          command: ./docker/docker-login.sh
-          name: Login to Docker Hub
+          command: ./docker/docker-init.sh
+          name: Login to Docker Hub, Install binfmt Platform, Create the buildx Builder
       - run:
-          command: ./docker/docker-install-binfmt-platforms.sh
-          name: Install binfmt platforms
+          command: ./docker-build-codex-base.sh
+          name: Build Base Image
       - run:
-          command: ./docker/docker-buildx-create.sh
-          name: Create buildx builder
+          command: ./docker-build-codex-builder-base.sh
+          name: Build Builder Base Image
+  build-base-arm64:
+    <<: *build-base
+    executor: arm64-medium-executor
+  build-dist:
+    executor: amd64-large-executor
+    steps:
+      - checkout
+      - restore_cache:
+          key: wheels-v1-{{ arch }}
+      - restore_cache:
+          key: dist-v1-{{ .Revision }}
       - run:
-          command: ./build-builder.sh
-          name: Build Builder
+          command: ./docker/docker-init.sh
+          name: Login to Docker Hub, Install binfmt platform & Create the buildx Builder
       - run:
-          command: ./docker/docker-compose-exit.sh codex-lint
-          name: Lint
+          command: ./docker-build-codex-dist-builder.sh
+          name: Build Distribution Builder Image
       - run:
-          command: ./docker/docker-compose-exit.sh codex-test
-          name: Test
+          command: ./docker/docker-compose-exit.sh codex-save-cache
+          name: Save python caches to host
+      - save_cache:
+          key: wheels-v1-{{ arch }}
+          paths:
+            - ./cache/packages
+      - run:
+          command: ./docker/docker-compose-exit.sh codex-frontend-lint
+          name: "Frontend: Lint"
+      - run:
+          command: ./docker/docker-compose-exit.sh codex-frontend-test
+          name: "Frontend: Test"
+      - store_test_results:
+          path: test-results/jest
+      - run:
+          command: ./docker/docker-compose-exit.sh codex-frontend-build
+          name: "Frontend: Build"
+      - run:
+          command: ./docker/docker-compose-exit.sh codex-backend-test
+          name: "Backend: Lint & Test"
+      - run:
+          command: ./docker/docker-compose-exit.sh codex-backend-lint
+          name: "Backend: Extra Linters"
       - store_test_results:
           path: test-results/pytest
       - store_artifacts:
           path: test-results/coverage
+      - store_artifacts:
+          path: frontend/coverage
       - run:
-          command: ./docker/docker-compose-exit.sh codex-dist
-          name: Build distribution
+          command: ./docker/docker-compose-exit.sh codex-build-dist
+          name: Build Distribution
+      - save_cache:
+          key: dist-cache-v1-{{ .Revision }}
+          paths:
+            - dist
       - persist_to_workspace:
           paths:
-            - ./.env
-            - ./.env.platforms
-            - ./Dockerfile
-            - ./README.md
-            - ./build-codex.sh
-            - ./build-install-poetry.sh
-            - ./build-wheels.sh
-            - ./deploy-pypi.sh
             - ./dist
-            - ./docker
-            - ./docker-compose.yaml
-            - ./pyproject.toml
-            - ./poetry.lock
-            - ./wheels-version.sh
           root: .
-  build-wheels:
-    executor: latest-image
+  build-amd64: &build
+    executor: amd64-medium-executor
     steps:
+      - checkout
       - attach_workspace:
           at: .
-          command: 
+      - restore_cache:
+          key: dist-v1-{{ .Revision }}
+      - restore_cache:
+          key: wheels-v1-{{ arch }}
       - run:
-          command: ./build-install-poetry.sh
-          name: Install poetry
-      - run:
-          command: ./docker/docker-login.sh
-          name: Login to Docker Hub
+          command: ./docker/docker-init.sh
+          name: Login to Docker Hub, Install binfmt platform & Create the buildx Builder
       - run:
-          command: ./docker/docker-install-binfmt-platforms.sh
-          name: Install binfmt platforms
+          command: ./docker-build-codex-builder-final.sh
+          name: Build Codex Builder Final
       - run:
-          command: ./docker/docker-buildx-create.sh
-          name: Create buildx builder
+          command: ./docker/docker-compose-exit.sh codex-save-final-cache
+          name: Save the final pip cache
+      - save_cache:
+          key: wheels-v1-{{ arch }}
+          paths:
+            - ./cache/packages
       - run:
-          no_output_timeout: 90m
-          command: ./build-wheels.sh
-          name: Get or Build Python wheels
+          command: ./docker-build-codex.sh
+          name: Build Codex Runnable Image
+  build-arm64:
+    <<: *build
+    executor: arm64-medium-executor
   deploy:
-    executor: latest-image
+    executor: amd64-small-executor
     steps:
+      - checkout
       - attach_workspace:
           at: .
-      - run:
-          command: ./build-install-poetry.sh
-          name: Install poetry
       - run:
           command: ./docker/docker-login.sh
           name: Login to Docker Hub
       - run:
-          command: ./docker/docker-install-binfmt-platforms.sh
-          name: Install binfmt platforms
+          command: ./docker-create-multiarch-codex.sh
+          name: Create multi-arch images
       - run:
-          command: ./docker/docker-buildx-create.sh
-          name: Create buildx builder
-      - run:
-          command: ./build-codex.sh
-          name: Build & Push Codex runnable image
-      - run:
-          command: ./deploy-pypi.sh
-          name: Publish Package to PyPi
+          command: ./pypi-deploy.sh
+          name: Publish Codex Package to PyPi
 version: 2.1
 workflows:
   main:
     jobs:
-      - test-and-build-dist:
-          filters:
+      - build-base-amd64: &filters-all
+          filters: 
             branches:
               only:
                 - develop
+                - release-candidate
                 - release
                 - /.*-ci/
-      - build-wheels:
-          filters:
+      - build-base-arm64: &filters-release
+          filters: 
             branches:
               only:
+                - release-candidate
                 - release
+      - build-dist:
+          <<: *filters-all
+          requires:
+            - build-base-amd64
+      - build-amd64:
+          <<: *filters-release
+          requires:
+            - build-dist
+            - build-base-amd64
+      - build-arm64:
+          <<: *filters-release
           requires:
-            - test-and-build-dist
+            - build-dist
+            - build-base-arm64
       - deploy:
-          filters:
-            branches:
-              only:
-                - release
+          <<: *filters-release
           requires:
-            - build-wheels
+            - build-amd64
+            - build-arm64
   version: 2.1

.dockerignore

@@ -1,24 +1,40 @@
 *.egg-info
 *.py[co]
+*Dockerfile
 *~
 .DS_Store
+.circleci
 .coverage*
+.env*
+.git
 .mypy_cache
 .picopt_timestamp
+.pytest_cache
 .ropeproject
 .venv
 /codex/static_build
 /codex/static_root
 /config
 /nginx
-Dockerfile*
 MANIFEST
 NEWS
 TODO.md
 __pycache__
+alpha*
 cache
+!cache/packages
 comics
+config
+deploy-pypi.sh
+dev*
+docker*
 docker-compose*
+kill-codex.sh
+mock_comics
 monkeytype.sqlite3
 node_modules
+strange.jpg
 test-results
+update-builder-requirement.sh
+version.sh
+wheels-version.sh

.env

@@ -1,7 +1,6 @@
-REPO=docker.io/ajslater/codex
-BUILDER_VERSION=impish_2
-WHEEL_BUILDER_VERSION=python3.10.1-alpine3.15_2
-RUNNABLE_BASE_VERSION=python3.10.1-alpine3.15_0_0
-PKG_VERSION=0.7.5
+#!/bin/sh
+# shellcheck disable=SC2034
+PYTHON_ALPINE_VERSION=3.10.1-alpine3.15_0
+PKG_VERSION=0.8.0rc2
 PUID=501
 PGID=20

.env.platforms

@@ -1 +1,4 @@
-PLATFORMS=linux/amd64,linux/arm64,linux/armhf
+#!/bin/sh
+# shellcheck disable=SC2034
+PLATFORMS=linux/amd64,linux/arm64
+#,linux/armhf

.eslintignore

@@ -0,0 +1,4 @@
+*~
+package-lock.json
+node_modules
+test-results