From 8cc2c9554f40533e0d42892ac89ef6dc2cd7236c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Mon, 12 Aug 2024 10:15:18 +0200 Subject: [PATCH] Revert "Fix Ruby in Docker container on Apple silicon" This reverts commit bbf3fb91a0389ab4c3fd9440b049a703425b28e7. --- Dockerfile | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index a6f8081..ba6b162 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,11 @@ # syntax=docker/dockerfile:1 -FROM debian:bullseye-slim as base +FROM ruby:3.3.0 SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# TODO Remove when upstream Ruby works properly on Apple silicon -RUN apt update && apt install -y build-essential wget autoconf libpq-dev pkg-config -RUN wget https://github.com/postmodern/ruby-install/releases/download/v0.9.3/ruby-install-0.9.3.tar.gz \ - && tar -xzvf ruby-install-0.9.3.tar.gz \ - && cd ruby-install-0.9.3/ \ - && make install -RUN ruby-install -p https://github.com/ruby/ruby/pull/9371.diff ruby 3.3.0 -ENV PATH="/opt/rubies/ruby-3.3.0/bin:${PATH}" +RUN apt-get update -qq && apt-get install -y --no-install-recommends curl \ + ldap-utils tini libvips -RUN apt-get install -y --no-install-recommends curl ldap-utils tini libvips RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - RUN apt-get update && apt-get install -y nodejs