From 9bba706add69435ba2c4a6eeeea26e1b683831bc Mon Sep 17 00:00:00 2001
From: bcd00 <47297759+bcd00@users.noreply.github.com>
Date: Wed, 27 Sep 2023 11:40:09 +0100
Subject: [PATCH] Adding ARM support to Docker (#142)

* Updating Dockerfile. Fixing on ARM arch and adding dependency caching. Needs testing on non-ARM arch.

* Updating package versions
---
 Dockerfile                            | 20 ++++++++++++++++++--
 packages/ove-ui-demo/package.json     |  2 +-
 packages/ove-ui-launcher/package.json |  2 +-
 packages/ove-ui-preview/package.json  |  2 +-
 packages/ove-ui-status/package.json   |  2 +-
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index eccbba7b..6f4155b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,29 @@
 FROM node:14-alpine
+
+RUN apk add --update g++ make py3-pip git && rm -rf /var/cache/apk/*
+USER root
+
 WORKDIR /usr/src/app
+RUN mkdir ./packages
+
+RUN for app in demo \launcher \preview \status; do mkdir "./packages/ove-ui-$app"; done
+COPY ./packages/ove-ui-demo/package.json ./packages/ove-ui-demo
+COPY ./packages/ove-ui-launcher/package.json ./packages/ove-ui-launcher
+COPY ./packages/ove-ui-preview/package.json ./packages/ove-ui-preview
+COPY ./packages/ove-ui-status/package.json ./packages/ove-ui-status
+
+RUN npm --global config set user root
 
 RUN npm install -global pm2
-RUN npm install -global lerna
+RUN npm install -global lerna@4.0.0
 
-COPY . .
+COPY package.json lerna.json ./
 RUN npm run install:prod
 
+COPY . .
+
 RUN npm uninstall -global lerna
+RUN apk del git g++ make py3-pip
 
 EXPOSE 8281-8284
 
diff --git a/packages/ove-ui-demo/package.json b/packages/ove-ui-demo/package.json
index 92d6edda..ec3132cd 100644
--- a/packages/ove-ui-demo/package.json
+++ b/packages/ove-ui-demo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ove/ove-ui-demo",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Launches demo scenarios on OVE",
   "main": "server.js",
   "private": true,
diff --git a/packages/ove-ui-launcher/package.json b/packages/ove-ui-launcher/package.json
index 3b1545c2..a7f7d5fc 100644
--- a/packages/ove-ui-launcher/package.json
+++ b/packages/ove-ui-launcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ove/ove-ui-launcher",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Launch applications on the OVE framework",
   "main": "server.js",
   "private": true,
diff --git a/packages/ove-ui-preview/package.json b/packages/ove-ui-preview/package.json
index 21797f22..be786d99 100644
--- a/packages/ove-ui-preview/package.json
+++ b/packages/ove-ui-preview/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ove/ove-ui-preview",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Preview spaces of the OVE framework",
   "main": "server.js",
   "private": true,
diff --git a/packages/ove-ui-status/package.json b/packages/ove-ui-status/package.json
index a5d469ab..e6acbe8e 100644
--- a/packages/ove-ui-status/package.json
+++ b/packages/ove-ui-status/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ove/ove-ui-status",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Displays status of all OVE components",
   "main": "server.js",
   "private": true,