Merge pull request #568 from HSLdevcom/development

Development

Author: avicarie

.eslintrc

@@ -1,7 +1,11 @@
 {
-  "parser": "babel-eslint",
+  "parser": "@babel/eslint-parser",
   "parserOptions": {
-    "sourceType": "module"
+    "sourceType": "module",
+    "requireConfigFile": false,
+    "babelOptions": {
+      "presets": ["@babel/preset-react", "@babel/preset-env"]
+    }
   },
   "extends": ["airbnb", "plugin:prettier/recommended"],
   "rules": {
@@ -16,6 +20,7 @@
     "guard-for-in": 0,
     "no-underscore-dangle": 0,
     "func-names": 0,
+    "class-methods-use-this": 0,
     "import/named": [1],
     "import/order": 0,
     "import/prefer-default-export": 0,
@@ -34,8 +39,16 @@
     "react/jsx-max-props-per-line": 0,
     "react/jsx-one-expression-per-line": 0,
     "react/jsx-props-no-multi-spaces": 0,
+    "react/jsx-props-no-spreading": 0,
     "react/jsx-tag-spacing": 0,
     "react/jsx-wrap-multilines": 0,
+    "react/jsx-no-useless-fragment": 0,
+    "react/no-unstable-nested-components": 0,
+    "react/no-unused-class-component-methods": 0,
+    "react/static-property-placement": 0,
+    "react/state-in-constructor": 0,
+    "react/function-component-definition": 0,
+    "react/jsx-fragments": 0,
     "jsx-a11y/img-has-alt": [0],
     "jsx-a11y/alt-text": 0
   },

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-bullseye-slim AS production
+FROM node:20-bullseye-slim AS production
 
 RUN apt-get -y update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -yq wget curl gnupg fontconfig fonts-liberation ca-certificates --no-install-recommends \
@@ -10,7 +10,8 @@ RUN apt-get -y update \
     && cp ./azcopy /usr/bin/ \
     && rm -rf /var/lib/apt/lists/*
 
-ENV NODE_OPTIONS=--openssl-legacy-provider
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/google-chrome-stable
 
 ENV WORK=/opt/publisher
 

Dockerfile.arm64

@@ -0,0 +1,34 @@
+FROM node:20-bullseye-slim AS production
+
+RUN apt-get -y update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -yq \
+        chromium fontconfig fonts-liberation ca-certificates wget curl \
+        --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install azcopy - auto-detect architecture
+RUN ARCH=$(dpkg --print-architecture) && \
+    AZCOPY_URL="https://github.com/Azure/azure-storage-azcopy/releases/download/v10.24.0/azcopy_linux_arm64_10.24.0.tar.gz" && \
+    wget -O /tmp/azcopy.tar.gz "$AZCOPY_URL" && \
+    tar -xzf /tmp/azcopy.tar.gz -C /tmp && \
+    find /tmp -name "azcopy" -type f -exec mv {} /usr/local/bin/azcopy \; && \
+    chmod +x /usr/local/bin/azcopy && \
+    rm -rf /tmp/azcopy*
+
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
+
+ENV WORK=/opt/publisher
+
+RUN mkdir -p ${WORK}
+WORKDIR ${WORK}
+
+COPY package.json package-lock.json .npmrc ${WORK}/
+RUN npm ci && npm cache clean --force
+
+COPY . ${WORK}
+
+RUN npm run build
+
+CMD ["sh", "-c", "node scripts/generateConfig.js && npm run ${SERVICE}"]
+

compose.yaml

@@ -64,11 +64,14 @@ services:
     volumes:
       - ./output:/opt/publisher/output
       - ./fonts:/fonts
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     depends_on:
       publisher-postgres:
         condition: service_started
       redis:
         condition: service_started
 
+
 volumes:
   dev_postgres: