hazza/docker-stacks
1
0
Fork 0
mirror of https://github.com/jupyter/docker-stacks.git synced 2025-10-13 13:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into asalikhov/docs_build_process

Browse Source
This commit is contained in:
Ayaz Salikhov
2021-06-20 23:51:21 +03:00
committed by GitHub
parent fe46e814ad 7db544fd6d
commit 28f4035299
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/docker.yml vendored
View File

@@ -56,18 +56,18 @@ jobs:
- name: Run Post-Build Hooks - name: Run Post-Build Hooks
run: make -C main hook-all run: make -C main hook-all
- name: Push Wiki to GitHub - name: Push Wiki to GitHub
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
# Pass GITHUB_REPOSITORY directly to avoid conflict with GitHub Actions built-in env var # Pass GITHUB_REPOSITORY directly to avoid conflict with GitHub Actions built-in env var
run: make -C main git-commit GITHUB_REPOSITORY='${{github.repository}}.wiki' run: make -C main git-commit GITHUB_REPOSITORY='${{github.repository}}.wiki'
env: env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
LOCAL_PATH: ../wiki LOCAL_PATH: ../wiki
- name: Login to Docker Hub - name: Login to Docker Hub
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
username: ${{secrets.DOCKERHUB_USERNAME}} username: ${{secrets.DOCKERHUB_USERNAME}}
password: ${{secrets.DOCKERHUB_TOKEN}} password: ${{secrets.DOCKERHUB_TOKEN}}
- name: Push Images to DockerHub - name: Push Images to DockerHub
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
run: make -C main push-all run: make -C main push-all

2
.github/workflows/sphinx.yml vendored
View File

@@ -41,7 +41,7 @@ jobs:
sphinx-build -M gettext ./ ./_build/ sphinx-build -M gettext ./ ./_build/
sphinx-intl update -p ./_build/gettext -l en sphinx-intl update -p ./_build/gettext -l en
- name: Push Strings to Master - name: Push Strings to Master
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
run: make git-commit run: make git-commit
env: env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

4
base-notebook/Dockerfile
View File

@@ -26,7 +26,7 @@ USER root
# Conda version # Conda version
ARG conda_version="4.10.1" ARG conda_version="4.10.1"
# Miniforge installer patch version # Miniforge installer patch version
ARG miniforge_patch_number="4" ARG miniforge_patch_number="5"
# Miniforge installer architecture # Miniforge installer architecture
ARG miniforge_arch="x86_64" ARG miniforge_arch="x86_64"
# Package Manager and Python implementation to use (https://github.com/conda-forge/miniforge) # Package Manager and Python implementation to use (https://github.com/conda-forge/miniforge)
@@ -39,7 +39,7 @@ ARG miniforge_version="${conda_version}-${miniforge_patch_number}"
# Miniforge installer # Miniforge installer
ARG miniforge_installer="${miniforge_python}-${miniforge_version}-Linux-${miniforge_arch}.sh" ARG miniforge_installer="${miniforge_python}-${miniforge_version}-Linux-${miniforge_arch}.sh"
# Miniforge checksum # Miniforge checksum
ARG miniforge_checksum="9eb335cb559644a6e462c077ebc129af51b7329817574fb707b994dafdddf2af" ARG miniforge_checksum="069e151cae85ed4747721e938e7974aa00889a1ae87cff33ddbdde9530fc4c6d"
# Install all OS dependencies for notebook server that starts but lacks all # Install all OS dependencies for notebook server that starts but lacks all
# features (e.g., download as all possible file formats) # features (e.g., download as all possible file formats)