From 424a978bffd4d03658bcd627549c74b127e52910 Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Halili Date: Sat, 21 Oct 2023 09:53:39 +0800 Subject: [PATCH 1/2] chore: update link to GitHub mirror Signed-off-by: Andrei Jiroh Halili --- .github/workflows/docker.yml | 5 +---- README.md | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index aef0924..7f60ad1 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16,7 +16,6 @@ env: # github.repository as / IMAGE_NAME: ${{ github.repository }} - jobs: build-ci: name: Build environment for GitLab CI/CD @@ -165,6 +164,4 @@ jobs: labels: ${{ steps.meta.outputs.labels }} cache-from: | type=registry,ref=quay.io/ajhalili2006/gitpod-workspace:buildkit-cache-web - type=registry,ref=ghcr.io/ajhalili2006/ajhalili2006.github.io/devenv:nightly - type=registry,ref=ghcr.io/ajhalili2006/ajhalili2006.github.io/devenv:branch-main - #cache-to: type=registry,ref=quay.io/ajhalili2006/gitpod-workspace:buildkit-cache-web + type=registry,ref=ghcr.io/ajhalili2006/website/devenv:nightly diff --git a/README.md b/README.md index dc65338..ec32dbf 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Hosted on pages.dev](https://img.shields.io/badge/hosted%20on-pages.dev-orange?style=flat-square&logo=cloudflare)](https://pages.dev) [![GitLab last commit](https://img.shields.io/gitlab/last-commit/andreijiroh.dev/website?gitlab_url=https%3A%2F%2Fmau.dev&style=flat-square)](https://mau.dev/andreijiroh.dev/website/commits) [![Staging builds on Read The Docs Community](https://readthedocs.org/projects/ajhalili2006/badge/?version=latest&style=flat-square)](https://readthedocs.org/projects/ajhalili2006/) -[![Docker CI](https://github.com/ajhalili2006/ajhalili2006.github.io/actions/workflows/docker.yml/badge.svg?event=schedule&style=flat-badge)](https://github.com/ajhalili2006/ajhalili2006.github.io/actions/workflows/docker.yml?query=event%3Aschedule) +[![Docker CI](https://github.com/ajhalili2006/website/actions/workflows/docker.yml/badge.svg?event=schedule&style=flat-badge)](https://github.com/ajhalili2006/website/actions/workflows/docker.yml?query=event%3Aschedule) [![GitLab CI status](https://mau.dev/andreijiroh.dev/website/badges/main/pipeline.svg?style=flat-square)](https://mau.dev/andreijiroh.dev/website/-/pipelines) This is my sources for both [`andreijiroh.(eu.org|dev)`](https://andreijiroh.eu.org) and tilde userpages, @@ -39,7 +39,7 @@ with some fine defaults, alongside a blog section if you prefer. Canonically developed at [mau.dev](https://mau.dev/andreijiroh.dev/website.git) where the deployments happen, with the following mirrors being maintained: -* GitHub: , where Docker image builds happen +* GitHub: , where Docker image builds happen * Jetbrains Space (personal): (repository clone URL: `git.jetbrains.space/ajhalili2006/web/andreijiroh.dev.git`) * Sourcehut: From 509b8204a537097c8c71a1be782c476f8bb75115 Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Halili Date: Sat, 21 Oct 2023 10:00:54 +0800 Subject: [PATCH 2/2] build(docker): update base image used for building workspace image Signed-off-by: Andrei Jiroh Halili --- .gitpod.Dockerfile | 2 +- .gitpod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 46a996e..2c9e3c3 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -23,4 +23,4 @@ COPY --from=docker/buildx-bin:latest /buildx /usr/libexec/docker/cli-plugins/doc # brew maintenance + install ShellCheck and Hadolint WORKDIR /home/gitpod RUN brew update && brew install hadolint shellcheck \ - && npm i -g wrangler \ No newline at end of file + && npm i -g wrangler diff --git a/.gitpod.yml b/.gitpod.yml index 2be2393..1cd4c23 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -6,7 +6,7 @@ checkoutLocation: tildeweb-ajhalili2006 -image: ghcr.io/ajhalili2006/ajhalili2006.github.io/devenv:commit-34a2eb5ce41701454dfede862a6284cc92bfe175 +image: quay.io/ajhalili2006/mkdocs-material-build-ci:commit-f1a2adaa1d977fe66e4f1791436027539fe187b8 tasks: - init: |