Fixing building docker base

s4hri · Dec 16, 2022 · 65f48c8 · 65f48c8
1 parent e1f8276
commit 65f48c8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git 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
@@ -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
@@ -24,6 +24,8 @@
 
 FROM node:16
 
+ARG RELEASE=master
+
 RUN mkdir /app
 WORKDIR /app