From 65f48c8d14922d7771f291a16f5d236331eddd7e Mon Sep 17 00:00:00 2001
From: Davide De Tommaso <dtmdvd@gmail.com>
Date: Fri, 16 Dec 2022 14:12:31 +0100
Subject: [PATCH] Fixing building docker base

---
 .github/workflows/CI.yml   | 4 ++--
 docker-compose.base.yml    | 8 ++++++++
 docker/frontend/Dockerfile | 2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index ab39580..8f830cf 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -47,8 +47,8 @@ jobs:
             sed -i -r 's/^(PYICUB_BRANCH=).*/\1${{ steps.extract_branch.outputs.branch }}/' .env
             sed -i -e "/ICUB_DISTRO=/c\ICUB_DISTRO=$(cut -d'_' -f3 <<<"${{ steps.tag.outputs.tag }}")" .env
             cat .env
-            source .env && docker build docker --build-arg DOCKER_SRC=${DOCKER_SRC} -t ${PJT_DOCKER_IMAGE} && docker push ${PJT_DOCKER_IMAGE}
-            source .env && docker build docker/frontend -t ${PYICUB_FRONTEND_DOCKER_IMAGE} && docker push ${PYICUB_FRONTEND_DOCKER_IMAGE}
+            bash .dockyman/build.sh base
+            bash .dockyman/build.sh distro
        env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/docker-compose.base.yml b/docker-compose.base.yml
index 382f06a..7e4fa1b 100644
--- a/docker-compose.base.yml
+++ b/docker-compose.base.yml
@@ -34,3 +34,11 @@ services:
       args:
         DOCKER_SRC: ${DOCKER_SRC}
         RELEASE: ${RELEASE}
+
+  pyicub-frontend.base:
+    image: ${PYICUB_FRONTEND_DOCKER_IMAGE}
+
+    build:
+      context: docker/frontend
+      args:
+        RELEASE: ${RELEASE}
diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile
index 478551b..c715634 100644
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -24,6 +24,8 @@
 
 FROM node:16
 
+ARG RELEASE=master
+
 RUN mkdir /app
 WORKDIR /app