Publish print service images to Docker Hub

.docker-hub/docker-compose.yml

@@ -14,3 +14,21 @@ services:
       context: ..
       dockerfile: .docker-hub/backend/Dockerfile
     image: ecamp/ecamp3-backend:latest
+
+  print:
+    build:
+      context: ..
+      dockerfile: .docker-hub/print/Dockerfile
+    image: ecamp/ecamp3-print:latest
+
+  worker-print-puppeteer:
+    build:
+      context: ..
+      dockerfile: .docker-hub/worker-print-puppeteer/Dockerfile
+    image: ecamp/ecamp3-worker-print-puppeteer:latest
+
+  worker-print-weasy:
+    build:
+      context: ..
+      dockerfile: .docker-hub/worker-print-weasy/Dockerfile
+    image: ecamp/ecamp3-worker-print-weasy:latest

.docker-hub/print/Dockerfile

@@ -0,0 +1,8 @@
+FROM node:12.18
+WORKDIR /app
+COPY print/package*.json ./
+RUN npm install
+COPY print .
+RUN npm run build
+EXPOSE 80
+CMD npm run start

.docker-hub/push.sh

@@ -3,4 +3,4 @@ set -e
 
 echo "$DOCKER_HUB_PASSWORD" | docker login -u "$DOCKER_HUB_USERNAME" --password-stdin
 docker-compose -f .docker-hub/docker-compose.yml build
-docker-compose -f .docker-hub/docker-compose.yml push backend frontend
+docker-compose -f .docker-hub/docker-compose.yml push backend frontend print worker-print-puppeteer worker-print-weasy

.docker-hub/worker-print-puppeteer/Dockerfile

@@ -0,0 +1,6 @@
+FROM buildkite/puppeteer
+WORKDIR /app
+COPY workers/print-puppeteer/package*.json ./
+RUN npm install
+COPY workers/print-puppeteer .
+CMD npm run print

.docker-hub/worker-print-weasy/Dockerfile

@@ -0,0 +1,21 @@
+FROM python:3.8
+
+# install all the dependencies except libcairo2 from jessie, then install libcairo2 from stretch
+RUN apt-get -y update \
+    && apt-get install -y \
+        fonts-font-awesome \
+        libffi-dev \
+        libgdk-pixbuf2.0-0 \
+        libpango1.0-0 \
+        python-dev \
+        python-lxml \
+        shared-mime-info \
+        libcairo2 
+
+WORKDIR /app
+
+RUN pip install WeasyPrint pika requests
+
+COPY workers/print-weasy .
+
+CMD python -u print.py

backend/config/autoload/sessions.local.docker.dist

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'session_config' => [
+      'cookie_domain' => '',
+    ],
+];

docker-compose.yml

@@ -31,7 +31,7 @@ services:
     image: node:12.18
     container_name: 'ecamp3-print'
     ports:
-      - '3003:3000'
+      - '3003:80'
     volumes:
       - ./print:/app:delegated
       - npm-cache:/root/.npm
@@ -40,6 +40,8 @@ services:
     command: ./docker-setup.sh
     environment:
       - HOST=0.0.0.0
+    env_file:
+      - ./print/print.env
 
   composer:
     image: composer:2
@@ -77,7 +79,7 @@ services:
       - '3004:15672'
 
   worker-print-puppeteer:
-    image: buildkite/puppeteer
+    build: ./workers/print-puppeteer
     container_name: 'ecamp3-worker-print-puppeteer'
     volumes:
       - ./workers/print-puppeteer:/app:delegated

print/README.md

@@ -6,7 +6,7 @@
 # install dependencies
 $ npm install
 
-# serve with hot reload at localhost:3000
+# serve with hot reload at localhost
 $ npm run dev
 
 # build for production and launch server

print/nuxt.config.js

@@ -11,6 +11,10 @@ export default {
    ** See https://nuxtjs.org/api/configuration-target
    */
   target: 'server',
+  server: {
+    port: 80,
+    host: '0.0.0.0',
+  },
   /*
    ** Headers of the page
    ** See https://nuxtjs.org/api/configuration-head
@@ -82,4 +86,16 @@ export default {
    ** See https://nuxtjs.org/api/configuration-build/
    */
   build: {},
+
+  publicRuntimeConfig: {
+    axios: {
+      browserBaseURL: process.env.API_ROOT_URL || 'http://localhost:3001/api',
+    },
+  },
+
+  privateRuntimeConfig: {
+    axios: {
+      baseURL: process.env.INTERNAL_API_ROOT_URL || 'http://backend/api',
+    },
+  },
 }

print/package.json

@@ -14,7 +14,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@nuxtjs/axios": "^5.11.0",
+    "@nuxtjs/axios": "^5.12.2",
     "nuxt": "^2.13.0",
     "pagedjs": "^0.1.42"
   },

print/print.env

@@ -0,0 +1,2 @@
+INTERNAL_API_ROOT_URL=http://backend/api
+API_ROOT_URL=http://localhost:3001/api

workers/print-puppeteer/Dockerfile

@@ -0,0 +1,6 @@
+FROM buildkite/puppeteer
+WORKDIR /app
+COPY package*.json ./
+RUN npm install
+COPY . .
+CMD npm run print

workers/print-puppeteer/environment.js

@@ -0,0 +1,9 @@
+module.exports = {
+  PRINT_SERVER: process.env.PRINT_SERVER || "http://print",
+  SESSION_COOKIE_DOMAIN: process.env.SESSION_COOKIE_DOMAIN || "backend",
+  AMQP_HOST: process.env.AMQP_HOST || 'rabbitmq',
+  AMQP_PORT: process.env.AMQP_PORT || '5672',
+  AMQP_VHOST: process.env.AMQP_VHOST || '/',
+  AMQP_USER: process.env.AMQP_USER || 'guest',
+  AMQP_PASS: process.env.AMQP_PASS || 'guest',
+};

workers/print-puppeteer/index.js

@@ -1,14 +1,7 @@
 const puppeteer = require('puppeteer');
 const amqp = require('amqplib/callback_api');
 
-const PRINT_SERVER = process.env.PRINT_SERVER || "http://print:3000";
-
-const AMQP_HOST = process.env.AMQP_HOST || 'rabbitmq';
-const AMQP_PORT = process.env.AMQP_PORT || '5672';
-const AMQP_VHOST= process.env.AMQP_VHOST || '/';
-const AMQP_USER = process.env.AMQP_USER || 'guest';
-const AMQP_PASS = process.env.AMQP_PASS || 'guest';
-
+const { PRINT_SERVER, SESSION_COOKIE_DOMAIN, AMQP_HOST, AMQP_PORT, AMQP_VHOST, AMQP_USER, AMQP_PASS } = require('./environment.js');
 
 async function startBrowser() {
     const browser = await puppeteer.launch({headless: true, args:['--no-sandbox']});
@@ -25,17 +18,9 @@ async function html2pdf(url, filename, sessionId) {
 
     const cookies = [
         {
-            "domain": "print",
-            "hostOnly": true,
-            "httpOnly": false,
+            "domain": SESSION_COOKIE_DOMAIN,
             "name": "PHPSESSID",
-            "path": "/",
-            "sameSite": "unspecified",
-            "secure": false,
-            "session": true,
-            "storeId": "1",
             "value": sessionId,
-            "id": 1
         }
     ]
 
@@ -44,7 +29,7 @@ async function html2pdf(url, filename, sessionId) {
     await page.goto(url);
 
     await page.waitFor(500);
-    await page.waitForSelector(".pagedjs_pages", {timeout:2000});
+    await page.waitForSelector(".pagedjs_pages", {timeout:10000});
 
     await page.pdf({path: `data/${filename}-puppeteer.pdf`});
 }
@@ -60,7 +45,7 @@ function start() {
                 throw error1;
             }
 
-            var queue = 'printer-puppeteer';
+            const queue = 'printer-puppeteer';
 
             channel.assertQueue(queue, {
                 durable: true

workers/print-weasy/.gitignore

@@ -0,0 +1 @@
+__pycache__

workers/print-weasy/environment.py

@@ -0,0 +1,8 @@
+import os
+
+PRINT_SERVER = os.getenv('PRINT_SERVER', 'http://print/')
+AMQP_HOST = os.getenv('AMQP_HOST', 'rabbitmq')
+AMQP_PORT = os.getenv('AMQP_PORT', '5672')
+AMQP_VHOST = os.getenv('AMQP_VHOST', '/')
+AMQP_USER = os.getenv('AMQP_USER', 'guest')
+AMQP_PASS = os.getenv('AMQP_PASS', 'guest')

workers/print-weasy/print.py

@@ -5,15 +5,8 @@
 import pika
 import json
 import requests
-import os
 
-PRINT_SERVER = os.getenv('PRINT_SERVER', 'http://print:3000/') 
-
-AMQP_HOST = os.getenv('AMQP_HOST', 'rabbitmq') 
-AMQP_PORT = os.getenv('AMQP_PORT', '5672') 
-AMQP_VHOST = os.getenv('AMQP_VHOST', '/') 
-AMQP_USER = os.getenv('AMQP_USER', 'guest') 
-AMQP_PASS = os.getenv('AMQP_PASS', 'guest') 
+from environment import *
 
 # create custom URL fetcher to include cookie
 def url_fetcher_factory(sessionId):