Updated workflows, moved scripts.

Author: vladd-bit

.github/workflows/docker-jupyter-hub.yml

@@ -82,8 +82,8 @@ jobs:
 
       - name: Build and push Docker Jupyter Hub image
         run: |
-          docker build --platform linux/${{ matrix.platform }} -t cogstacksystems/jupyter-hub:${{ env.RELEASE_VERSION }}-linux/${{ matrix.platform }} -f Dockerfile_hub --build-arg CPU_ARCHITECTURE=${{ matrix.platform }} .
-          docker push cogstacksystems/jupyter-hub:${{ env.RELEASE_VERSION }}-linux/${{ matrix.platform }}
+          docker build --platform linux/${{ matrix.platform }} -t cogstacksystems/jupyter-hub:${{ env.RELEASE_VERSION }}-${{ matrix.platform }} -f Dockerfile_hub --build-arg CPU_ARCHITECTURE=${{ matrix.platform }} .
+          docker push cogstacksystems/jupyter-hub:${{ env.RELEASE_VERSION }}-${{ matrix.platform }}
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/docker-jupyter-singleuser-gpu.yml

@@ -92,7 +92,7 @@ jobs:
           file : "./Dockerfile_singleuser_gpu"
           allow: network.host
           github-token: ${{ github.token }}
-          tags: cogstacksystems/jupyter-singleuser-gpu:${{ env.RELEASE_VERSION }}-linux/amd64
+          tags: cogstacksystems/jupyter-singleuser-gpu:${{ env.RELEASE_VERSION }}-amd64
           push: true
 
       - name: Image digest

.github/workflows/docker-jupyter-singleuser.yml

@@ -91,8 +91,8 @@ jobs:
 
       - name: Build and push Docker Jupyter singleuser image
         run: |
-          docker build --platform linux/${{ matrix.platform }} -t cogstacksystems/jupyter-singleuser:${{ env.RELEASE_VERSION }}-linux/${{ matrix.platform }} -f Dockerfile_singleuser --build-arg CPU_ARCHITECTURE=${{ matrix.platform }} .
-          docker push cogstacksystems/jupyter-singleuser:${{ env.RELEASE_VERSION }}-linux/${{ matrix.platform }}
+          docker build --platform linux/${{ matrix.platform }} -t cogstacksystems/jupyter-singleuser:${{ env.RELEASE_VERSION }}-${{ matrix.platform }} -f Dockerfile_singleuser --build-arg CPU_ARCHITECTURE=${{ matrix.platform }} .
+          docker push cogstacksystems/jupyter-singleuser:${{ env.RELEASE_VERSION }}-${{ matrix.platform }}
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

.gitignore

@@ -18,5 +18,8 @@ docs/build/*
 **__pycache__
 
 # env files with passwords or local paths
-*.env
+**.env
+env**
+
+# cert files
 security**

Dockerfile_singleuser

@@ -186,7 +186,7 @@ RUN pip3 cache purge
 #######################################################################################################
 
 # install R and other dependencies
-COPY r_kernel_install.sh /etc/jupyterhub/
+COPY ./scripts/r_kernel_install.sh /etc/jupyterhub/
 # RUN Rscript /etc/jupyterhub/r_kernel_install.sh
 
 # create jupyterhub shared folder

Dockerfile_singleuser_gpu

@@ -219,7 +219,7 @@ RUN pip3 cache purge
 #######################################################################################################
 
 # install R and other dependencies
-COPY r_kernel_install.sh /etc/jupyterhub/
+COPY ./scripts/r_kernel_install.sh /etc/jupyterhub/
 RUN Rscript /etc/jupyterhub/r_kernel_install.sh
 
 # create jupyterhub shared folder

env/general.env

@@ -2,4 +2,5 @@
 
 # This is used to explicitly inform systems that run on Apple silicon to emulate this architecture
 # Remove if this causes issues on any other platform
-DOCKER_DEFAULT_PLATFORM=linux/amd64
+CPU_ARCHITECTURE=amd64
+DOCKER_DEFAULT_PLATFORM=linux/${CPU_ARCHITECTURE:-amd64}