Bump Alpine and OCaml versions

Dockerfile

@@ -1,7 +1,7 @@
 ##########################################################################################################################
 ### Binary build for testing. Pulled from registry. The base-dependencies-alpine spec builds this. Used by .travis.yml ###
 ##########################################################################################################################
-FROM comby/comby:base-dependencies-alpine-3.14
+FROM comby/comby:base-dependencies-alpine-3.21
 
 WORKDIR /home/comby
 

README.md

@@ -78,7 +78,7 @@ To match these with comby, all you need to write is `if (:[condition])`, and spe
 
 ```
 opam init
-opam switch create 4.11.0 4.11.0
+opam switch create 4.13.0 4.13.0
 ```
 
 - Run `eval $(opam env)`

dockerfiles/alpine/base-dependencies/Dockerfile

@@ -1,7 +1,7 @@
 #########################
 ### Base Dependencies ###
 #########################
-FROM ocaml/opam:alpine-3.14-ocaml-4.11
+FROM ocaml/opam:alpine-3.21-ocaml-4.13
 
 WORKDIR /home/comby
 

dockerfiles/alpine/binary-release-plus-rg/Dockerfile

@@ -1,7 +1,7 @@
 #######################################
 ### Source build for alpine release ###
 #######################################
-FROM comby/comby:base-dependencies-alpine-3.14 AS source-build-alpine
+FROM comby/comby:base-dependencies-alpine-3.21 AS source-build-alpine
 
 WORKDIR /home/comby
 
@@ -28,7 +28,7 @@ RUN opam exec -- dune build --profile release
 ###########################################################
 ### Binary distribution on minimal alpine image with rg ###
 ###########################################################
-FROM alpine:3.14
+FROM alpine:3.21
 
 LABEL maintainer="Rijnard van Tonder <rvantonder@gmail.com>"
 LABEL name="comby"

dockerfiles/alpine/binary-release/Dockerfile

@@ -1,7 +1,7 @@
 #######################################
 ### Source build for alpine release ###
 #######################################
-FROM comby/comby:base-dependencies-alpine-3.14 AS source-build-alpine
+FROM comby/comby:base-dependencies-alpine-3.21 AS source-build-alpine
 
 WORKDIR /home/comby
 
@@ -28,7 +28,7 @@ RUN opam exec -- dune build --profile release
 ###################################################
 ### Binary distribution on minimal alpine image ###
 ###################################################
-FROM alpine:3.14
+FROM alpine:3.21
 
 LABEL maintainer="Rijnard van Tonder <rvantonder@gmail.com>"
 LABEL name="comby"

dockerfiles/ubuntu/binary-release-18.04/Dockerfile

@@ -12,8 +12,8 @@ RUN sudo apt-get update && sudo apt-get install -y \
     libev-dev \
     libsqlite3-dev
 
-RUN opam init --no-setup --disable-sandboxing --compiler=4.11.0
-RUN opam switch create 4.11.0 && eval $(opam config env) && opam repository set-url default https://opam.ocaml.org && opam update
+RUN opam init --no-setup --disable-sandboxing --compiler=4.13.1
+RUN opam switch create 4.13.1 && eval $(opam config env) && opam repository set-url default https://opam.ocaml.org && opam update
 
 COPY Makefile /home/comby/
 COPY comby.opam /home/comby/

dockerfiles/ubuntu/binary-release/Dockerfile

@@ -14,8 +14,8 @@ RUN sudo apt-get update && sudo apt-get install -y \
     openssl \
     libssl-dev
 
-RUN opam init --no-setup --disable-sandboxing --compiler=4.11.0
-RUN opam switch create 4.11.0 && eval $(opam config env) && opam repository set-url default https://opam.ocaml.org && opam update
+RUN opam init --no-setup --disable-sandboxing --compiler=4.13.0
+RUN opam switch create 4.13.0 && eval $(opam config env) && opam repository set-url default https://opam.ocaml.org && opam update
 
 COPY Makefile /home/comby/
 COPY comby.opam /home/comby/

scripts/build-base-dependencies-alpine-image.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 cd ..
-docker build --no-cache --tag comby/comby:base-dependencies-alpine-3.14 -f dockerfiles/alpine/base-dependencies/Dockerfile .
+docker build --no-cache --tag comby/comby:base-dependencies-alpine-3.21 -f dockerfiles/alpine/base-dependencies/Dockerfile .
 echo "If it succeeds, go and push the image:"
-echo "docker push comby/comby:base-dependencies-alpine-3.14"
+echo "docker push comby/comby:base-dependencies-alpine-3.21"
 echo "Now run ./build-docker-binary-releases.sh to make sure the base dependencies image is updated."

scripts/build-docker-binary-releases.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ -z "$1" ]; then
-  echo "Set alpine version tag name, like 'alpine-3.14'"
+  echo "Set alpine version tag name, like 'alpine-3.21'"
   exit 1
 fi
 

scripts/release.sh

@@ -47,7 +47,7 @@ cp scripts/install-with-licenses.sh scripts/$VERSION/get/index.html
 comby '"0.x.0"' "$VERSION" .html -i -d scripts/$VERSION
 
 # Alpine docker image
-ALPINE_VERSION=alpine-3.14
+ALPINE_VERSION=alpine-3.21
 cd scripts
 ./build-docker-binary-releases.sh $ALPINE_VERSION
 docker tag comby-$ALPINE_VERSION-binary-release:latest comby/comby:$ALPINE_VERSION-$VERSION

scripts/run-docker-binary.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # mount /tmp/host to tmp in docker and run the binary
-docker run -it -v /tmp/host:/tmp comby-alpine-3.14-binary-release -version
-docker run -it -v /tmp/host:/tmp comby-alpine-3.14-binary-release-plus-rg -version
+docker run -it -v /tmp/host:/tmp comby-alpine-3.21-binary-release -version
+docker run -it -v /tmp/host:/tmp comby-alpine-3.21-binary-release-plus-rg -version
 echo 'For ubuntu, do: docker run -it -v /tmp/host:/tmp comby-ubuntu-20.04-binary-release'
 echo 'Then run:       ./_build/default/src/main.exe -version'