Merge pull request #65 from pprzetacznik/fix/docker_build_1.14

chore: Bump otp and iex in Dockerfile requirements

.github/workflows/docker.yml

@@ -3,11 +3,22 @@ name: IElixir Docker
 on:
   push:
     branches: master
+  pull_request:
+    branches:
+      - 'master'
+      - 'feature/**'
+      - 'fix/**'
 
 jobs:
   main:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout IElixir project
+        uses: actions/checkout@v2
+      - name: Generate version
+        id: gen_ielixir_version
+        run: |
+          echo "IELIXIR_VERSION=$(cat ./VERSION).$(date '+%Y%m%d%H%M%S')" >> "$GITHUB_OUTPUT"
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
@@ -23,16 +34,18 @@ jobs:
         with:
           push: true
           file: ./docker/ielixir-requirements/Dockerfile
-          tags: pprzetacznik/ielixir-requirements:latest
+          tags: pprzetacznik/ielixir-requirements:${{ steps.gen_ielixir_version.outputs.IELIXIR_VERSION }}
           build-args: |
-            ERL_VERSION=23.1.2
-            ELIXIR_VERSION=1.11.2
+            ERL_VERSION=26.2.3
+            ELIXIR_VERSION=1.14.2
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v2
         with:
           push: true
           file: ./docker/ielixir/Dockerfile
-          tags: pprzetacznik/ielixir:latest
+          tags: pprzetacznik/ielixir:${{ steps.gen_ielixir_version.outputs.IELIXIR_VERSION }}
+          build-args: |
+            IELIXIR_REQUIREMENTS_DOCKER_VERSION=${{ steps.gen_ielixir_version.outputs.IELIXIR_VERSION }}
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/elixir.yml

@@ -7,6 +7,7 @@ on:
     branches:
       - 'master'
       - 'feature/**'
+      - 'fix/**'
 
 jobs:
   build:
@@ -19,7 +20,8 @@ jobs:
         otp-version: ['26']
         python-version: ['3.8', '3.12']
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout IElixir project
+      uses: actions/checkout@v2
     - name: Install prerequisites
       run: |
         sudo apt install -y openssl libncurses5

README.md

@@ -185,6 +185,8 @@ If you would like to make some changes to the images you can find dockerfiles in
 * docker/ielixir - for dockerfile source of pprzetacznik/ielixir image,
 * docker/ielixir-requirements - for dockerfile source of pprzetacznik/ielixir-requirements image.
 
+Elixir builds takend from [hex.pm builds.txt](https://repo.hex.pm/builds/elixir/builds.txt).
+
 #### Other docker images worth seeing
 
 * [Dockerfile for smaller image based on alpine](https://github.com/cprieto/docker-jupyter/blob/master/elixir/Dockerfile)

VERSION

@@ -0,0 +1 @@
+1.0.0

docker/ielixir-requirements/Dockerfile

@@ -6,8 +6,9 @@ ENV WORK_DIR=/opt
 ENV ERL_TOP=$WORK_DIR/otp \
     ELIXIR_TOP=$WORK_DIR/elixir
 ENV PATH=$ERL_TOP/target/bin:$ELIXIR_TOP/bin:$PATH \
-    ERL_VERSION=23.1.2 \
-    ELIXIR_VERSION=1.11.2
+    ERL_VERSION_SHORT=26 \
+    ERL_VERSION=26.2.2 \
+    ELIXIR_VERSION=1.14.5
 
 RUN set -xe \
   && apt-get update \
@@ -29,7 +30,7 @@ RUN set -xe \
 
 RUN mkdir -p $WORK_DIR \
   && cd $WORK_DIR \
-  && wget https://github.com/erlang/otp/archive/OTP-$ERL_VERSION.zip -O otp.zip \
+  && wget https://github.com/erlang/otp/archive/refs/tags/OTP-${ERL_VERSION}.zip -O otp.zip \
   && unzip otp.zip -d $WORK_DIR \
   && mv $WORK_DIR/otp-OTP-$ERL_VERSION $ERL_TOP \
   && rm otp.zip
@@ -38,9 +39,10 @@ RUN cd $ERL_TOP \
   && ./otp_build autoconf \
   && ./configure --prefix=$ERL_TOP/target \
   && make \
-  && make install \
-  && cd $WORK_DIR \
-  && wget https://github.com/elixir-lang/elixir/releases/download/v$ELIXIR_VERSION/Precompiled.zip -O elixir.zip \
+  && make install
+
+RUN cd $WORK_DIR \
+  && wget https://builds.hex.pm/builds/elixir/v${ELIXIR_VERSION}-otp-${ERL_VERSION_SHORT}.zip -O elixir.zip \
   && unzip elixir.zip -d $ELIXIR_TOP \
   && rm elixir.zip
 

docker/ielixir/Dockerfile

@@ -1,4 +1,5 @@
-FROM pprzetacznik/ielixir-requirements
+ARG IELIXIR_REQUIREMENTS_DOCKER_VERSION
+FROM pprzetacznik/ielixir-requirements:$IELIXIR_REQUIREMENTS_DOCKER_VERSION
 
 ENV WORK_DIR=/opt
 
@@ -9,10 +10,11 @@ RUN apt install -y \
     libsqlite3-dev
 
 RUN set -xe \
-  && curl -s https://api.github.com/repos/pprzetacznik/IElixir/releases/latest | grep "tarball_url" | sed -n -e 's/.*tarball_url": "\(.*\)".*/\1/p' | xargs -t curl -fSL -o ielixir.tar.gz \
-  && mkdir ielixir \
-  && tar -zxvf ielixir.tar.gz -C ielixir --strip-components=1 \
-  && rm ielixir.tar.gz \
+  && curl -L https://github.com/pprzetacznik/IElixir/archive/refs/heads/master.zip -o ielixir.zip \
+  && apt install -y unzip \
+  && unzip ielixir.zip -d ielixir_tmp \
+  && mv ielixir_tmp/IElixir-master ielixir \
+  && rm -rf ielixir_tmp \
   && cd ielixir \
   && ls -alh \
   && mix local.hex --force \

mix.exs

@@ -1,12 +1,10 @@
 defmodule IElixir.Mixfile do
   use Mix.Project
 
-  @version "0.9.21"
-
   def project do
     [
       app: :ielixir,
-      version: @version,
+      version: read_version(),
       source_url: "https://github.com/pprzetacznik/IElixir",
       name: "IElixir",
       elixir: ">= 1.14.0",
@@ -73,4 +71,10 @@ defmodule IElixir.Mixfile do
       }
     ]
   end
+
+  def read_version() do
+    "VERSION"
+    |> File.read!
+    |> String.trim
+  end
 end