feat: migrate to buildah, ng:v18

Author: autowp

.eslintrc.json

@@ -67,10 +67,6 @@
       "rules": {
         "prettier/prettier": ["error", { "parser": "angular" }]
       }
-    },
-    {
-      "files": ["*.json"],
-      "extends": ["plugin:json/recommended"]
     }
   ]
 }

.gitlab-ci.yml

@@ -1,7 +1,4 @@
 variables:
-  DOCKER_DRIVER: overlay2
-  DOCKER_TLS_CERTDIR: ""
-  DOCKER_HOST: tcp://docker:2375
   SONAR_HOST_URL: https://sonarcloud.io
 
 image: $CI_REGISTRY/autowp/runner-base-image
@@ -24,28 +21,23 @@ build:
     - npx ng lint
     - npx stylelint "src/**/*.scss"
     - sonar-scanner -Dsonar.login=$SONAR_TOKEN
-    - ./node_modules/.bin/ng build --configuration production --no-progress --base-href=/ --extra-webpack-config webpack.extra.js
+    - ./node_modules/.bin/ng build --configuration production --no-progress --base-href=/
     - npx semantic-release
   rules:
     - if: $CI_COMMIT_TAG !~ /^v\d.*/
 
 deploy:
   stage: deploy
-  services:
-    - name: docker:dind
-      alias: docker
-  before_script:
-    - waitforit -address=tcp://docker:2375 -timeout=30
   script:
     - npm ci || npm cache clear --force && npm ci
     - "jq -n --arg release \"$CI_COMMIT_TAG\" '{release: $release}' > src/version.json"
-    - ./node_modules/.bin/ng build --configuration production --no-progress --base-href=/ --extra-webpack-config webpack.extra.js
+    - ./node_modules/.bin/ng build --configuration production --no-progress --base-href=/
 
-    - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-    - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY_IMAGE"
-    - docker pull "$CI_REGISTRY_IMAGE" || true
-    - docker build . -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
-    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
+    - echo "$DOCKER_PASSWORD" | buildah login -u "$DOCKER_USERNAME" --password-stdin docker.io
+    - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
+    - buildah pull "$CI_REGISTRY_IMAGE" || true
+    - buildah build . -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
+    - buildah push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
 
     - sentry-cli releases new "$CI_COMMIT_TAG" || true
     - git config --global user.email "$GITLAB_USER_EMAIL"
@@ -58,11 +50,9 @@ deploy:
     - git push origin master
     - sentry-cli releases finalize "$CI_COMMIT_TAG" || true
 
-    - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-    - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY_IMAGE"
-    - docker pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
-    - docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" autowp/autowp-frontend:$CI_COMMIT_TAG
-    - docker push autowp/autowp-frontend:$CI_COMMIT_TAG
+    - buildah pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
+    - buildah tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" autowp/autowp-frontend:$CI_COMMIT_TAG
+    - buildah push autowp/autowp-frontend:$CI_COMMIT_TAG
   rules:
     - if: $CI_COMMIT_TAG =~ /^v\d.*/
   environment:

Dockerfile

@@ -1,4 +1,4 @@
-FROM nginxinc/nginx-unprivileged:1-alpine
+FROM docker.io/nginxinc/nginx-unprivileged:1-alpine
 
 LABEL app_name="autowp-frontend" \
       maintainer="dmitry@pereslegin.ru"

angular.json

@@ -53,7 +53,7 @@
       },
       "architect": {
         "build": {
-          "builder": "ngx-build-plus:browser",
+          "builder": "@angular-devkit/build-angular:browser",
           "options": {
             "outputPath": "dist",
             "index": "src/index.html",
@@ -168,7 +168,7 @@
           }
         },
         "serve": {
-          "builder": "ngx-build-plus:dev-server",
+          "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
             "browserTarget": "wheelsage:build"
           },
@@ -192,9 +192,6 @@
               "src/**/*.html"
             ]
           }
-        },
-        "test": {
-          "builder": "ngx-build-plus:karma"
         }
       }
     }

build-dev.sh

@@ -2,6 +2,6 @@
 
 set -e
 
-./node_modules/.bin/ng build --base-href=/ --extra-webpack-config webpack.extra.js --configuration=test
+./node_modules/.bin/ng build --base-href=/ --configuration=test
 
 cp -R ./dist/* ../autowp/frontend/