revise api and tasks build

No longer webpack bundled - just copied straight in and used is

Author: marcolarosa

Dockerfile.api-build

@@ -1,19 +1,11 @@
-FROM --platform=$TARGETPLATFORM node:18-bullseye AS api-builder
-WORKDIR /srv
-COPY api/ /srv/
-RUN npm install
-RUN npm run build:production
-
 FROM  --platform=$TARGETPLATFORM node:18-bullseye-slim
-WORKDIR /srv/api
 LABEL org.opencontainers.image.source=https://github.com/CoEDL/nyingarn-workspace
 LABEL org.opencontainers.image.description="The Nyingarn Workspace API container"
 LABEL org.opencontainers.image.licenses=GPLv3
 
 RUN apt-get update && apt-get install -y postgresql-client ca-certificates
-COPY --from=api-builder /srv/dist/package.json /srv/api/package.json
-COPY --from=api-builder /srv/dist/package-lock.json /srv/api/package-lock.json
+COPY api /srv/api
 COPY scripts/wait-for-postgres.sh /srv/api/wait-for-postgres.sh
+WORKDIR /srv/api
 RUN npm install
-COPY --from=api-builder /srv/dist/ /srv/api/
-CMD [ "/srv/api/wait-for-postgres.sh", "node", "./server.bundle.js" ]
+CMD [ "/srv/api/wait-for-postgres.sh", "node", "/srv/api/index.js" ]

Dockerfile.tasks-build

@@ -1,20 +1,11 @@
-FROM --platform=$TARGETPLATFORM node:18-bullseye AS tasks-builder
-COPY tasks /srv/tasks
-COPY api /srv/api
-WORKDIR /srv/tasks
-RUN npm install
-RUN npm run build:production
-
 FROM node:18-bullseye-slim
-WORKDIR /srv
 LABEL org.opencontainers.image.source=https://github.com/CoEDL/nyingarn-workspace
 LABEL org.opencontainers.image.description="The Nyingarn Workspace Tasks container"
 LABEL org.opencontainers.image.licenses=GPLv3
 
-RUN apt-get update && apt-get install -y ca-certificates
-COPY --from=tasks-builder /srv/tasks/package.json /srv/package.json
-COPY --from=tasks-builder /srv/tasks/package-lock.json /srv/package-lock.json
+RUN apt-get update && apt-get install -y  postgresql-client ca-certificates
+COPY tasks /srv/tasks
+COPY api /srv/api
+WORKDIR /srv/tasks
 RUN npm install
-COPY --from=tasks-builder /srv/tasks/dist/ /srv/
-COPY tasks/src/xslt /srv/tasks/src/xslt
-CMD [ "node", "./server.bundle.js" ]
+CMD [ "node", "/srv/tasks/index.js" ]

api/package.json

@@ -11,7 +11,6 @@
         "develop:server": "npm install && sleep 10 && npm run load:datapacks && ./node_modules/.bin/nodemon --exec babel-node ./index.js",
         "test": "./node_modules/.bin/jest --runInBand",
         "test:watch": "./node_modules/.bin/jest --watch --runInBand",
-        "build:production": "./node_modules/.bin/webpack --config webpack.production.cjs",
         "load:datapacks": "sleep 10 && node ./load-data-packs.js"
     },
     "devDependencies": {

api/webpack.production.cjs

@@ -10,8 +10,7 @@
         "develop": "npm run develop:server",
         "develop:server": "npm install && ./node_modules/.bin/nodemon --exec babel-node ./index.js",
         "test": "./node_modules/.bin/jest --runInBand",
-        "test:watch": "./node_modules/.bin/jest --watch --runInBand",
-        "build:production": "./node_modules/.bin/webpack --config webpack.production.cjs"
+        "test:watch": "./node_modules/.bin/jest --watch --runInBand"
     },
     "devDependencies": {
         "@babel/cli": "^7.19.3",