diff --git a/.github/workflows/build-and-push-dockerimage.yml b/.github/workflows/build-and-push-dockerimage.yml index bf1d24d..0549c08 100644 --- a/.github/workflows/build-and-push-dockerimage.yml +++ b/.github/workflows/build-and-push-dockerimage.yml @@ -20,11 +20,13 @@ jobs: tensorflow_version="${git_branch#tf-}" # remove prefix tensorflow_version="${tensorflow_version%-*}" # remove suffix base_image="tensorflow/tensorflow:${tensorflow_version}-gpu-jupyter" + framework="cuda" image_name="pharmbio-notebook" echo "IMAGE_NAME=$image_name" >> $GITHUB_ENV echo "TAG=$tag" >> $GITHUB_ENV echo "BASE_IMAGE=$base_image" >> $GITHUB_ENV + echo "FRAMEWORK=$framework" >> $GITHUB_ENV - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 diff --git a/.inputrc b/.inputrc index c343ed5..4d1163e 100644 --- a/.inputrc +++ b/.inputrc @@ -83,3 +83,5 @@ set enable-bracketed-paste set enable-bracketed-paste set enable-bracketed-paste set enable-bracketed-paste +set enable-bracketed-paste +set enable-bracketed-paste diff --git a/build-local-docker.sh b/build-local-docker.sh index cc70343..f3266ad 100755 --- a/build-local-docker.sh +++ b/build-local-docker.sh @@ -11,11 +11,11 @@ echo "tag=$tag" echo "image=$image" #switch to buildx build # Build docker image for this container. -docker buildx build -t ghcr.io/pharmbio/$image:$tag-devel \ +docker buildx build --no-cache -t ghcr.io/pharmbio/$image:$tag-devel \ --build-arg BASE_IMAGE=tensorflow/tensorflow:${tensorflow_version}-jupyter \ --build-arg FRAMEWORK=cpu \ -f ./docker/env.Dockerfile . || exit 1 -docker buildx build -t ghcr.io/pharmbio/$image:${tag}-gpu-devel \ +docker buildx build --no-cache -t ghcr.io/pharmbio/$image:${tag}-gpu-devel \ --build-arg BASE_IMAGE=tensorflow/tensorflow:${tensorflow_version}-gpu-jupyter \ --build-arg FRAMEWORK=cuda \ -f docker/env.Dockerfile . || exit 1 diff --git a/docker/env.Dockerfile b/docker/env.Dockerfile index 43e9d39..0d3f12a 100644 --- a/docker/env.Dockerfile +++ b/docker/env.Dockerfile @@ -4,7 +4,7 @@ ARG BASE_IMAGE="tensorflow/tensorflow:latest" # Example default FROM $BASE_IMAGE # ARG FRAMEWORK need to be after the build stage FROM (since it is used in another build process) -ARG FRAMEWORK="cpu" +ARG FRAMEWORK # Set shell ENV SHELL=/bin/bash