Update dockerfile for parcel/watcher package fix (#110)

* Update dockerfile for parcel/watcher package fix Signed-off-by: thepetk <[email protected]> * Add make to installed deps Signed-off-by: thepetk <[email protected]> * Downgrade watcher to 2.1.0 Signed-off-by: thepetk <[email protected]> * add env var for arm64 support and update docs Signed-off-by: Jordan Dubrick <[email protected]> --------- Signed-off-by: thepetk <[email protected]> Signed-off-by: Jordan Dubrick <[email protected]> Co-authored-by: Jordan Dubrick <[email protected]>
devfile · Dec 1, 2023 · 163464e · 163464e
1 parent 35324bf
commit 163464e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -39,3 +39,7 @@ Owners of the repository will watch out for and review new PRs.
 If comments have been given in a review, they have to be addressed before merging.
 
 After addressing review comments, don’t forget to add a comment in the PR afterward, so everyone gets notified by Github and knows to re-review.
+
+## Troubleshooting
+
+- There is a known issue with Apple Silicon (arm64) architectures that may cause the `build_viewer.sh` script to fail. If this issue occurs first run `export PLATFORM_EV=linux/arm64`.
diff --git a/Dockerfile b/Dockerfile
@@ -16,10 +16,11 @@
 FROM registry.access.redhat.com/ubi9/nodejs-18-minimal AS deps
 USER root
 
-# Install yarn
+# Install yarn & node-gyp dependency
 RUN \
   curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
-  microdnf install -y yarn
+  microdnf install -y yarn python3 gcc-c++ make && \
+  npm install --build-from-resource node-gyp
 
 # Project non-specific args
 ARG PROJECT_NAME

diff --git a/scripts/build_viewer.sh b/scripts/build_viewer.sh
@@ -18,10 +18,11 @@ set -eux
 
 ABSOLUTE_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 BUILD_DIR=$ABSOLUTE_PATH/..
+PLATFORM_EV=${PLATFORM_EV:-"linux/amd64"}
 
 # Set Docker/Podman alias if necessary
 . ${ABSOLUTE_PATH}/setenv.sh
 
-docker build --no-cache -t registry-viewer $BUILD_DIR \
+docker build --platform ${PLATFORM_EV} --no-cache -t registry-viewer $BUILD_DIR \
     --build-arg PROJECT_NAME=registry-viewer \
     --build-arg NEXT_PUBLIC_BASE_PATH=${NEXT_PUBLIC_BASE_PATH:-"/viewer"}