diff --git a/Dockerfile b/Dockerfile index 4e9c8d01..806971a8 100644 --- a/Dockerfile +++ b/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 diff --git a/README.md b/README.md index 6c15e1b9..8ebef34f 100644 --- a/README.md +++ b/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)` diff --git a/dockerfiles/alpine/base-dependencies/Dockerfile b/dockerfiles/alpine/base-dependencies/Dockerfile index 5c8d4c24..e3e168ab 100644 --- a/dockerfiles/alpine/base-dependencies/Dockerfile +++ b/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 diff --git a/dockerfiles/alpine/binary-release-plus-rg/Dockerfile b/dockerfiles/alpine/binary-release-plus-rg/Dockerfile index e218a279..48605bd7 100644 --- a/dockerfiles/alpine/binary-release-plus-rg/Dockerfile +++ b/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 " LABEL name="comby" diff --git a/dockerfiles/alpine/binary-release/Dockerfile b/dockerfiles/alpine/binary-release/Dockerfile index 12c8847f..75572bc1 100644 --- a/dockerfiles/alpine/binary-release/Dockerfile +++ b/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 " LABEL name="comby" diff --git a/dockerfiles/ubuntu/binary-release-18.04/Dockerfile b/dockerfiles/ubuntu/binary-release-18.04/Dockerfile index 8f9e8a89..8c4277ea 100644 --- a/dockerfiles/ubuntu/binary-release-18.04/Dockerfile +++ b/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/ diff --git a/dockerfiles/ubuntu/binary-release/Dockerfile b/dockerfiles/ubuntu/binary-release/Dockerfile index 57f7072d..a70139a9 100644 --- a/dockerfiles/ubuntu/binary-release/Dockerfile +++ b/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/ diff --git a/scripts/build-base-dependencies-alpine-image.sh b/scripts/build-base-dependencies-alpine-image.sh index 3042c1b4..7f16e73d 100755 --- a/scripts/build-base-dependencies-alpine-image.sh +++ b/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." diff --git a/scripts/build-docker-binary-releases.sh b/scripts/build-docker-binary-releases.sh index 69420a4a..4cb498d6 100755 --- a/scripts/build-docker-binary-releases.sh +++ b/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 diff --git a/scripts/release.sh b/scripts/release.sh index 38d67b4f..9d6e65bb 100755 --- a/scripts/release.sh +++ b/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 diff --git a/scripts/run-docker-binary.sh b/scripts/run-docker-binary.sh index 6adf5aca..85f67be3 100755 --- a/scripts/run-docker-binary.sh +++ b/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'