From 90c7a1d6999710f5502d69162a197e979f90bb1a Mon Sep 17 00:00:00 2001 From: hachi8833 Date: Thu, 1 Feb 2024 13:16:26 +0900 Subject: [PATCH] Remove unnecessary bison for Ruby 3.3.0 https://github.com/ruby/ruby/pull/7798 --- 3.3/alpine3.18/Dockerfile | 1 - 3.3/alpine3.19/Dockerfile | 1 - 3.3/bookworm/Dockerfile | 1 - 3.3/bullseye/Dockerfile | 1 - 3.3/slim-bookworm/Dockerfile | 1 - 3.3/slim-bullseye/Dockerfile | 1 - Dockerfile.template | 6 ++++++ 7 files changed, 6 insertions(+), 6 deletions(-) diff --git a/3.3/alpine3.18/Dockerfile b/3.3/alpine3.18/Dockerfile index 74a9ed71a..a8fc31e8d 100644 --- a/3.3/alpine3.18/Dockerfile +++ b/3.3/alpine3.18/Dockerfile @@ -38,7 +38,6 @@ RUN set -eux; \ \ apk add --no-cache --virtual .ruby-builddeps \ autoconf \ - bison \ bzip2 \ bzip2-dev \ ca-certificates \ diff --git a/3.3/alpine3.19/Dockerfile b/3.3/alpine3.19/Dockerfile index ca56f0f9f..09166fdd9 100644 --- a/3.3/alpine3.19/Dockerfile +++ b/3.3/alpine3.19/Dockerfile @@ -38,7 +38,6 @@ RUN set -eux; \ \ apk add --no-cache --virtual .ruby-builddeps \ autoconf \ - bison \ bzip2 \ bzip2-dev \ ca-certificates \ diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index ec774551c..42ab5f94e 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -28,7 +28,6 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bison \ dpkg-dev \ libgdbm-dev \ ruby \ diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index a2f0cdd3f..3be8ea342 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -28,7 +28,6 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bison \ dpkg-dev \ libgdbm-dev \ ruby \ diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index a873fb2ec..ace67cb4a 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -42,7 +42,6 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bison \ dpkg-dev \ libgdbm-dev \ ruby \ diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index 58b43445a..da0533312 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -42,7 +42,6 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bison \ dpkg-dev \ libgdbm-dev \ ruby \ diff --git a/Dockerfile.template b/Dockerfile.template index 4cb9f1ea3..b59a19ea7 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -69,7 +69,10 @@ RUN set -eux; \ {{ if is_alpine then ( -}} apk add --no-cache --virtual .ruby-builddeps \ autoconf \ +{{ if [ "3.0", "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} +{{ # https://github.com/docker-library/ruby/pull/438 -}} bison \ +{{ ) else "" end -}} bzip2 \ bzip2-dev \ ca-certificates \ @@ -103,7 +106,10 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ +{{ if [ "3.0", "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} +{{ # https://github.com/docker-library/ruby/pull/438 -}} bison \ +{{ ) else "" end -}} dpkg-dev \ libgdbm-dev \ ruby \