diff --git a/Dockerfile b/Dockerfile index 81c520b..66516d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,13 @@ FROM ghcr.io/amutake/satysfi-base-image:opam-2.1.3-ocaml-4.14.0 # Versions -ENV SATYSFI_VERSION=0.0.10 +ENV SATYSFI_VERSION=0.0.11 ENV SATYROGRAPHOS_VERSION=0.0.2.13 # Setup SATySFi & Satyrographos RUN opam update RUN apt-get update \ - # temporary fix https://x.com/puripuri2100/status/1737857311866269876 - && opam install camlimages.5.0.4-1 satysfi.${SATYSFI_VERSION} satysfi-dist.${SATYSFI_VERSION} satyrographos.${SATYROGRAPHOS_VERSION} \ + && opam install satysfi.${SATYSFI_VERSION} satysfi-dist.${SATYSFI_VERSION} satyrographos.${SATYROGRAPHOS_VERSION} \ && rm -rf /var/lib/apt/lists/* RUN opam exec -- satyrographos install diff --git a/README.md b/README.md index 791715e..84e0be0 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,12 @@ This repository provides docker images for [SATySFi](https://github.com/gfngfn/S Images are available at [Docker Hub - amutake/satysfi](https://hub.docker.com/r/amutake/satysfi/). -| tag | size | satysfi version | satyrographos version | opam | supported arch | note | -| ------------------------------------------ | -------------------------------------------------------------------------------------------------------------------- | ------------------- | --------------------- | ------------- | ---------------- | ---------------------------- | -| `latest`, `0.0.10` | ![badge](https://img.shields.io/docker/image-size/amutake/satysfi/latest?color=black&label=%20&logo=docker) | `0.0.10` | `0.0.2.13` | o | `amd64`, `arm64` | | -| `slim`, `0.0.10-slim` | ![badge](https://img.shields.io/docker/image-size/amutake/satysfi/slim?color=black&label=%20&logo=docker) | `0.0.10` | `0.0.2.13` | x | `amd64`, `arm64` | | -| `opam-slim`, `0.0.10-opam-slim` | ![badge](https://img.shields.io/docker/image-size/amutake/satysfi/opam-slim?color=black&label=%20&logo=docker) | `0.0.10` | `0.0.2.13` | o (minimized) | `amd64`, `arm64` | **EXPERIMENTAL** | -| `nightly` | ![badge](https://img.shields.io/docker/image-size/amutake/satysfi/nightly?color=black&label=%20&logo=docker) | master branch | master branch | x | `amd64` | built at 00:00 UTC every day | +| tag | size | satysfi version | satyrographos version | opam | supported arch | note | +| ------------------------------- | -------------------------------------------------------------------------------------------------------------- | --------------- | --------------------- | ------------- | ---------------- | ---------------------------- | +| `latest`, `0.0.11` | ![badge](https://img.shields.io/docker/image-size/amutake/satysfi/latest?color=black&label=%20&logo=docker) | `0.0.11` | `0.0.2.13` | o | `amd64`, `arm64` | | +| `slim`, `0.0.11-slim` | ![badge](https://img.shields.io/docker/image-size/amutake/satysfi/slim?color=black&label=%20&logo=docker) | `0.0.11` | `0.0.2.13` | x | `amd64`, `arm64` | | +| `opam-slim`, `0.0.11-opam-slim` | ![badge](https://img.shields.io/docker/image-size/amutake/satysfi/opam-slim?color=black&label=%20&logo=docker) | `0.0.11` | `0.0.2.13` | o (minimized) | `amd64`, `arm64` | **EXPERIMENTAL** | +| `nightly` | ![badge](https://img.shields.io/docker/image-size/amutake/satysfi/nightly?color=black&label=%20&logo=docker) | master branch | master branch | x | `amd64` | built at 00:00 UTC every day | ## How to use diff --git a/branch/Dockerfile b/branch/Dockerfile index c2b58cf..a23c4ad 100644 --- a/branch/Dockerfile +++ b/branch/Dockerfile @@ -22,8 +22,7 @@ RUN git clone https://github.com/gfngfn/SATySFi.git /root/SATySFi WORKDIR /root/SATySFi RUN git checkout ${BRANCH} RUN opam pin add --no-action --kind local satysfi . -# temporary fix https://x.com/puripuri2100/status/1737857311866269876 -RUN opam install camlimages.5.0.4-1 satysfi +RUN opam install satysfi RUN apt-get update \ && apt-get install -y wget \ && ./download-fonts.sh diff --git a/opam-slim/Dockerfile b/opam-slim/Dockerfile index 9aa9bc2..2e5ee05 100644 --- a/opam-slim/Dockerfile +++ b/opam-slim/Dockerfile @@ -1,14 +1,13 @@ FROM ghcr.io/amutake/satysfi-base-image:opam-2.1.3-ocaml-4.14.0 AS build-env # Versions -ENV SATYSFI_VERSION=0.0.10 +ENV SATYSFI_VERSION=0.0.11 ENV SATYROGRAPHOS_VERSION=0.0.2.13 # Setup SATySFi & Satyrographos RUN apt-get update RUN opam update -# temporary fix https://x.com/puripuri2100/status/1737857311866269876 -RUN opam install camlimages.5.0.4-1 satysfi.${SATYSFI_VERSION} satyrographos.${SATYROGRAPHOS_VERSION} +RUN opam install satysfi.${SATYSFI_VERSION} satyrographos.${SATYROGRAPHOS_VERSION} RUN eval $(opam env) && cp $(which satysfi) / && cp $(which satyrographos) / # -- @@ -17,7 +16,7 @@ FROM ubuntu:22.04 # Versions ENV OPAM_VERSION=2.1.3 -ENV SATYSFI_VERSION=0.0.10 +ENV SATYSFI_VERSION=0.0.11 ENV SATYROGRAPHOS_VERSION=0.0.2.13 # opam's config vars diff --git a/slim/Dockerfile b/slim/Dockerfile index 4ed9c29..fdd1109 100644 --- a/slim/Dockerfile +++ b/slim/Dockerfile @@ -1,14 +1,13 @@ FROM ghcr.io/amutake/satysfi-base-image:opam-2.1.3-ocaml-4.14.0 AS build-env # Versions -ENV SATYSFI_VERSION=0.0.10 +ENV SATYSFI_VERSION=0.0.11 ENV SATYROGRAPHOS_VERSION=0.0.2.13 # Setup SATySFi & Satyrographos RUN apt-get update RUN opam update -# temporary fix https://x.com/puripuri2100/status/1737857311866269876 -RUN opam install camlimages.5.0.4-1 satysfi.${SATYSFI_VERSION} satysfi-dist.${SATYSFI_VERSION} satyrographos.${SATYROGRAPHOS_VERSION} +RUN opam install satysfi.${SATYSFI_VERSION} satysfi-dist.${SATYSFI_VERSION} satyrographos.${SATYROGRAPHOS_VERSION} RUN eval $(opam env) && \ satyrographos install --copy && \ cp $(which satysfi) / && \