From 8cdc410b00246cd55c35420140a6df99ac1d7c19 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 12 Jan 2024 16:29:15 -0800 Subject: [PATCH] Remove/deprecate GitHub Pages image See https://github.com/tianon/dockerfiles/pull/604 (and https://github.com/github/pages-gem/issues/752#issuecomment-1563750824) --- .test/config.sh | 5 ----- github-pages/Dockerfile | 32 -------------------------------- github-pages/Dockerfile.template | 26 -------------------------- github-pages/gsl.sh | 1 - github-pages/versions.json | 6 ------ github-pages/versions.sh | 22 ---------------------- 6 files changed, 92 deletions(-) delete mode 100644 github-pages/Dockerfile delete mode 100644 github-pages/Dockerfile.template delete mode 120000 github-pages/gsl.sh delete mode 100644 github-pages/versions.json delete mode 100755 github-pages/versions.sh diff --git a/.test/config.sh b/.test/config.sh index db526c4f52f..0cad172dfcf 100755 --- a/.test/config.sh +++ b/.test/config.sh @@ -29,11 +29,6 @@ globalExcludeTests+=( [tianon/containerd:c8dind_override-cmd]=1 ) -# ONBUILD -explicitTests+=( - [tianon/github-pages]=1 -) - # run Docker tests on Docker images :D testAlias+=( [tianon/docker-master]='docker:dind' diff --git a/github-pages/Dockerfile b/github-pages/Dockerfile deleted file mode 100644 index cad85055502..00000000000 --- a/github-pages/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# https://pages.github.com/versions/ -FROM ruby:2.7-alpine3.16 -# https://www.ruby-lang.org/en/news/2023/03/30/ruby-2-7-8-released/ - -ENV GITHUB_PAGES_VERSION 228 - -RUN set -eux; \ - \ - apk add --no-cache --virtual .build-deps \ - make \ - gcc \ - g++ \ - patch \ - ; \ - \ - gem install github-pages -v "$GITHUB_PAGES_VERSION"; \ - \ - apk del --no-network .build-deps; \ - \ - jekyll serve --help > /dev/null - -WORKDIR /blog -EXPOSE 4000 -CMD ["jekyll", "serve", "--host", "0.0.0.0"] - -ONBUILD COPY . /blog diff --git a/github-pages/Dockerfile.template b/github-pages/Dockerfile.template deleted file mode 100644 index 79bf8d21b85..00000000000 --- a/github-pages/Dockerfile.template +++ /dev/null @@ -1,26 +0,0 @@ -# https://pages.github.com/versions/ -FROM ruby:{{ .ruby.version }}-alpine3.16 -# https://www.ruby-lang.org/en/news/2023/03/30/ruby-2-7-8-released/ - -ENV GITHUB_PAGES_VERSION {{ .version }} - -RUN set -eux; \ - \ - apk add --no-cache --virtual .build-deps \ - make \ - gcc \ - g++ \ - patch \ - ; \ - \ - gem install github-pages -v "$GITHUB_PAGES_VERSION"; \ - \ - apk del --no-network .build-deps; \ - \ - jekyll serve --help > /dev/null - -WORKDIR /blog -EXPOSE 4000 -CMD ["jekyll", "serve", "--host", "0.0.0.0"] - -ONBUILD COPY . /blog diff --git a/github-pages/gsl.sh b/github-pages/gsl.sh deleted file mode 120000 index 65ad8ee78fe..00000000000 --- a/github-pages/gsl.sh +++ /dev/null @@ -1 +0,0 @@ -../.gsl-common/gsl-version-env.sh \ No newline at end of file diff --git a/github-pages/versions.json b/github-pages/versions.json deleted file mode 100644 index 9a2d6f136a9..00000000000 --- a/github-pages/versions.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": "228", - "ruby": { - "version": "2.7" - } -} diff --git a/github-pages/versions.sh b/github-pages/versions.sh deleted file mode 100755 index 7d4eca42ecc..00000000000 --- a/github-pages/versions.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash -set -Eeuo pipefail - -[ -e versions.json ] - -# https://pages.github.com/versions/ -json="$(wget -qO- 'https://pages.github.com/versions.json')" - -json="$(jq <<<"$json" -c ' - { - version: ."github-pages", - ruby: ( - .ruby - | capture("^(?[0-9]+[.][0-9]+)[.]") - ), - } -')" - -version="$(jq <<<"$json" -r '.version')" -echo >&2 "github-pages: $version" - -jq <<<"$json" '.' > versions.json