Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Jupyterlab docker build #1001

Merged
merged 15 commits into from
Jan 20, 2022
Merged

Fix Jupyterlab docker build #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
12d5029
Update code-server install.sh snapshot url
viniciusdc Jan 19, 2022
a094144
Update context path
viniciusdc Jan 19, 2022
0d674e5
Update context path
viniciusdc Jan 19, 2022
5fc9e63
Avoid handlebars usage
viniciusdc Jan 19, 2022
1785897
Pin docker build action to v2.7
viniciusdc Jan 20, 2022
588ca7f
Use env vars to avoid handlebars catch
viniciusdc Jan 20, 2022
13f6817
Use env vars to avoid handlebars catch
viniciusdc Jan 20, 2022
7ea1ce3
Silly attempt
viniciusdc Jan 20, 2022
aad50c4
Use glob pattern to target cookiecutter repo dir
viniciusdc Jan 20, 2022
899521b
Silly test
viniciusdc Jan 20, 2022
70ee2f9
Silly test
viniciusdc Jan 20, 2022
cff4e39
Inspect dir tree
viniciusdc Jan 20, 2022
f0dbd08
Silly test
viniciusdc Jan 20, 2022
ae6973d
Avoid handlebars using symlink
viniciusdc Jan 20, 2022
767deab
Avoid handlebars using symlink
viniciusdc Jan 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .github/workflows/image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,18 @@ jobs:
type=ref,event=tag
type=sha

- name: Add symlink to cookiecutter dir and tree
run: |
cd ./qhub/template
ln -s ./\{\{\ cookiecutter.repo_directory\ \}\} cookiecutter
sudo apt-get install tree
tree ./cookiecutter/image

- name: Build docker
uses: docker/build-push-action@v2
with:
context: "./qhub/template/{{ cookiecutter.repo_directory }}/image"
file: "./qhub/template/{{ cookiecutter.repo_directory }}/image/Dockerfile.${{ matrix.dockerfile }}"
context: ./qhub/template/cookiecutter/image
file: "./qhub/template/cookiecutter/image/Dockerfile.${{ matrix.dockerfile }}"
tags: |
${{ steps.meta.outputs.tags }}
ghcr.io/${{ steps.meta.outputs.tags }}
Expand All @@ -89,6 +96,6 @@ jobs:
- name: Lint Dockerfiles
uses: jbergstroem/hadolint-gh-action@v1
with:
dockerfile: ./qhub/template/\{\{\ cookiecutter.repo_directory\ \}\}/image/Dockerfile.${{ matrix.dockerfile }}
dockerfile: ./qhub/template/cookiecutter/image/Dockerfile.${{ matrix.dockerfile }}
output_format: tty
error_level: 0
4 changes: 2 additions & 2 deletions qhub/template/{{ cookiecutter.repo_directory }}/image/jupyterlab/postBuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ cp /opt/jupyterlab/overrides.json /opt/conda/share/jupyter/lab/settings
mkdir -p /opt/code_server
cd /opt/code_server
# Fetch the snapshot of https://code-server.dev/install.sh as of the time of writing
curl -fsSL https://raw.githubusercontent.com/cdr/code-server/003dc0feeb5d437be1d6a4565fec7808b5aac69b/install.sh > install.sh
expected_sum=4f66ead4b4ed2be7c746f1eaf6672f3e0cddad66924d9b6c513d108d68a0127c
curl -fsSL https://raw.githubusercontent.com/coder/code-server/ec3d9974b3494e6055c8e65e1fb0e4bc665429a7/install.sh > install.sh
expected_sum=4e1199a09f0777580aa2d8651f620d984ab99a45121cbd154c300a0280de751d

if [[ ! $(sha256sum install.sh) == "${expected_sum} install.sh" ]];then
echo Unexpected hash from code-server install script
Expand Down