From 868a80f4962c040bf842a39efab41a94586b773b Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Fri, 2 Aug 2024 13:23:31 +0200 Subject: [PATCH 1/3] Install requirements when building the devcontainer image --- .devcontainer/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 9798bfa..266746e 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -2,3 +2,6 @@ FROM python:3.10.4-slim-buster RUN apt-get update RUN apt-get install -y libsass-dev build-essential libcairo2 git libpango-1.0-0 libpangoft2-1.0-0 pangocairo-1.0 pngquant + +COPY .devcontainer/requirements.txt requirements.txt +RUN pip3 install -r requirements.txt From f9ec87b41f9bedfdce446d7f02c6993e1efebc50 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Fri, 2 Aug 2024 13:31:00 +0200 Subject: [PATCH 2/3] Fix Dockerfile sourcing --- .devcontainer/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 266746e..b887480 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,5 +3,5 @@ FROM python:3.10.4-slim-buster RUN apt-get update RUN apt-get install -y libsass-dev build-essential libcairo2 git libpango-1.0-0 libpangoft2-1.0-0 pangocairo-1.0 pngquant -COPY .devcontainer/requirements.txt requirements.txt -RUN pip3 install -r requirements.txt +COPY requirements.txt /build/requirements.txt +RUN pip3 install -r /build/requirements.txt From 95d64505b70b84ea85e8707b54402cac7bb5c45e Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Fri, 2 Aug 2024 13:34:58 +0200 Subject: [PATCH 3/3] Use the isolated Docker image --- .github/workflows/ci.yml | 4 ++-- .github/workflows/deploy.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21c0242..431d47a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,8 +38,8 @@ jobs: - name: Build in the dev container image uses: devcontainers/ci@v0.3 with: - imageName: ghcr.io/oleg-nenashev/oleg-nenashev-site-builder - cacheFrom: ghcr.io/oleg-nenashev/oleg-nenashev-site-builder + imageName: ghcr.io/gradleup/gradleup.github.io-builder + cacheFrom: ghcr.io/gradleup/gradleup.github.io-builder push: never runCmd: | mkdocs build diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f1f2ffd..b343161 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -54,8 +54,8 @@ jobs: - name: Build in the dev container image uses: devcontainers/ci@v0.3 with: - imageName: ghcr.io/oleg-nenashev/oleg-nenashev-site-builder - cacheFrom: ghcr.io/oleg-nenashev/oleg-nenashev-site-builder + imageName: gradleup/gradleup.github.io-builder + cacheFrom: gradleup/gradleup.github.io-builder push: never runCmd: | mkdocs build