From d23942ebd8a4bed18583bc14f411207e0d2f6789 Mon Sep 17 00:00:00 2001
From: Michiel Kodde <mkodde@ibuildings.nl>
Date: Tue, 25 Jan 2022 12:18:01 +0100
Subject: [PATCH 1/2] Finetune the Dockerfile for Stepup builds

---
 .github/workflows/build-php-stepup.yml |  2 +-
 docker/php-build-stepup/Dockerfile     | 27 +++++++++++++-------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-php-stepup.yml b/.github/workflows/build-php-stepup.yml
index 068963e..1364e02 100644
--- a/.github/workflows/build-php-stepup.yml
+++ b/.github/workflows/build-php-stepup.yml
@@ -17,7 +17,7 @@ jobs:
         username: ${{ github.repository_owner }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Build the Apache container and push to GitHub Packages
+    - name: Build the Stepup build container and push to GitHub Packages
       uses: docker/build-push-action@v2
       with:
         tags: ghcr.io/openconext/openconext-containers/openconext-php-build-stepup:latest
diff --git a/docker/php-build-stepup/Dockerfile b/docker/php-build-stepup/Dockerfile
index 9ce0dc4..a219b61 100644
--- a/docker/php-build-stepup/Dockerfile
+++ b/docker/php-build-stepup/Dockerfile
@@ -1,8 +1,5 @@
 FROM php:7.2
 
-ARG NPM_UID=1000
-ARG NPM_GID=1000
-
 # Install dependencies
 RUN apt-get update && apt-get install -y \
     git \
@@ -17,22 +14,26 @@ RUN apt-get update && apt-get install -y \
     && docker-php-ext-enable apc --ini-name 20-docker-php-ext-apc.ini
 
 ENV NVM_DIR /usr/local/nvm
-ENV NODE_VERSION 10
+ENV NODE_VERSION 14
 
 # Install nvm with node and npm
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash
-    && source $NVM_DIR/nvm.sh \
+RUN mkdir $NVM_DIR \
+    && curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.39.0/install.sh | bash \
+    && . $NVM_DIR/nvm.sh \
+    && ln -s $NVM_DIR/nvm.sh /usr/local/bin/nvm \
     && nvm install $NODE_VERSION \
     && nvm alias default $NODE_VERSION \
-    && nvm use default
-
-    # Composer
+    && nvm use default \
+    && export INSTALLED_NODE_VERSION=$(nvm version) \
+    # Yarn
+    && npm install --global yarn \
+    # Link Node and Yarn to be available using Docker Run
+    && ln -s /usr/local/nvm/versions/node/$INSTALLED_NODE_VERSION/bin/node /usr/local/bin/node \
+    && ln -s /usr/local/nvm/versions/node/$INSTALLED_NODE_VERSION/bin/yarn /usr/local/bin/yarn
+
+# Composer
 COPY --from=composer:1 /usr/bin/composer /usr/local/bin/composer
 
-# Fix npm
-RUN mkdir /.npm && chown -R "${NPM_UID}:${NPM_GID}" "/.npm"
-RUN mkdir /.config && chown -R "${NPM_UID}:${NPM_GID}" "/.config"
-
 # Cleanup
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 

From e5fcd0b46b3457378110c3b9303f3406842c429a Mon Sep 17 00:00:00 2001
From: Michiel Kodde <mkodde@ibuildings.nl>
Date: Tue, 25 Jan 2022 16:12:43 +0100
Subject: [PATCH 2/2] Remove the symlinks

We will be using the binaries from a bash standpoint, no need to expose
these for us them using docker run
---
 docker/php-build-stepup/Dockerfile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/docker/php-build-stepup/Dockerfile b/docker/php-build-stepup/Dockerfile
index a219b61..b53da02 100644
--- a/docker/php-build-stepup/Dockerfile
+++ b/docker/php-build-stepup/Dockerfile
@@ -20,16 +20,12 @@ ENV NODE_VERSION 14
 RUN mkdir $NVM_DIR \
     && curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.39.0/install.sh | bash \
     && . $NVM_DIR/nvm.sh \
-    && ln -s $NVM_DIR/nvm.sh /usr/local/bin/nvm \
     && nvm install $NODE_VERSION \
     && nvm alias default $NODE_VERSION \
     && nvm use default \
     && export INSTALLED_NODE_VERSION=$(nvm version) \
     # Yarn
-    && npm install --global yarn \
-    # Link Node and Yarn to be available using Docker Run
-    && ln -s /usr/local/nvm/versions/node/$INSTALLED_NODE_VERSION/bin/node /usr/local/bin/node \
-    && ln -s /usr/local/nvm/versions/node/$INSTALLED_NODE_VERSION/bin/yarn /usr/local/bin/yarn
+    && npm install --global yarn
 
 # Composer
 COPY --from=composer:1 /usr/bin/composer /usr/local/bin/composer