cleans CI.

.github/workflows/ci.yml

@@ -43,6 +43,8 @@ jobs:
       #  uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
+        with:
+          driver: docker
       - name: Build and push
         uses: docker/build-push-action@v4
         with:

Dockerfile

@@ -11,6 +11,10 @@ ARG DOCKER_CONFIG="/usr/local/lib/docker/cli-plugins"
 
 USER root
 
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
 # Copy the list artefacts to install
 # Ubuntu and PIP packages, ...
 COPY Artefacts/ /tmp/Artefacts/

build.sh

-#!/bin/bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-. ${DIR}/env.sh
-
-#DOCKER_BUILDKIT=1 docker build \
-docker buildx build \
-	--file Dockerfile \
-	-t ${BASE}:$SHA \
-	`[[ "$BRANCH" != "master" ]] && echo -t ${BASE}:$BRANCH` \
-	`[[ "$BRANCH" == "master" ]] && echo -t ${BASE}:latest` $@ \
-	 .
+docker build --progress=plain -t brunoe/jupyter-base:develop .

env.sh

-#!/bin/bash
-REGISTRY=brunoe
-IMAGE_NAME=${PWD##*/}
-
-CURRENT=`pwd`
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-cd $DIR
-BASE=${REGISTRY}/${IMAGE_NAME}
-BRANCH=`git rev-parse --abbrev-ref HEAD|tr '/' '_' `
-SHA=`git log -1 --pretty=%h`
-cd $CURRENT

push.sh

-#!/bin/bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-echo $DIR
-. ${DIR}/env.sh
-
-BASE=${REGISTRY}/${IMAGE_NAME}
-BRANCH=`git rev-parse --abbrev-ref HEAD`
-
-echo Branche:$BRANCH
-docker push ${BASE} --all-tags
-