Skip to content
Snippets Groups Projects
Commit 8e0b87cf authored by Andre Maroneze's avatar Andre Maroneze
Browse files

Merge branch 'update-dockerfile-versions' into 'master'

[dev] update opam, fedora and alpine versions in Dockerfiles

See merge request frama-c/frama-c!4528
parents b907d975 a53a2efb
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ RUN /init/install.sh \ ...@@ -26,7 +26,7 @@ RUN /init/install.sh \
unzip \ unzip \
wget wget
RUN bash -c "yes '' | sh <(curl -fsSL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh)" --version 2.1.3 RUN bash -c "yes '' | sh <(curl -fsSL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh)" --version 2.1.5
# Avoid using root (opam dislikes it) # Avoid using root (opam dislikes it)
COPY add-user.sh /init/ COPY add-user.sh /init/
......
...@@ -56,8 +56,8 @@ version=$(shell grep -o "^- OCaml [0-9.]\+" "../../reference-configuration.md" | ...@@ -56,8 +56,8 @@ version=$(shell grep -o "^- OCaml [0-9.]\+" "../../reference-configuration.md" |
BUILD_ARGS += --build-arg=OCAML_VERSION=$(version) BUILD_ARGS += --build-arg=OCAML_VERSION=$(version)
%.debian: BUILD_ARGS += --build-arg=DISTRO=debian:bookworm-slim %.debian: BUILD_ARGS += --build-arg=DISTRO=debian:bookworm-slim
%.fedora: BUILD_ARGS += --build-arg=DISTRO=fedora:38 %.fedora: BUILD_ARGS += --build-arg=DISTRO=fedora:39
%.alpine: BUILD_ARGS += --build-arg=DISTRO=alpine:3.18 %.alpine: BUILD_ARGS += --build-arg=DISTRO=alpine:3.19
dev-all: dev.debian dev-stripped.debian dev-gui.debian \ dev-all: dev.debian dev-stripped.debian dev-gui.debian \
dev.fedora dev-stripped.fedora dev-gui.fedora \ dev.fedora dev-stripped.fedora dev-gui.fedora \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment