Skip to content

docker images: opam split #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
pgiarrusso-sl wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

docker images: opam split #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8196461
less aggressive opam clean
Blaisorblade Nov 7, 2025
80edb23
feat,docker: use stage3 as fm-release
Blaisorblade Nov 7, 2025
a9a908b
Revert "less aggressive opam clean"
Blaisorblade Nov 7, 2025
6223875
Debug
Blaisorblade Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,12 @@ include docker-img-basics.mk

# Shared between release
include docker-img-stage-release-misc.mk
# "Old" release, single Opam layer
include docker-img-stage-release.mk
# "New" release, multiple Opam layers, not yet ready
# TODO enable
# include docker-img-stage1-vendored.mk
# include docker-img-stage2-auto.mk
# include docker-img-stage2-auto-llvm.mk
# include docker-img-stage3-cpp2v.mk
# include docker-img-stage4-skylabs.mk
include docker-img-stage1-vendored.mk
include docker-img-stage2-auto.mk
include docker-img-stage2-auto-llvm.mk
include docker-img-stage3-cpp2v.mk
include docker-img-stage4-skylabs.mk

.PHONY: build
build: $(DOCKER_BUILD_TARGETS)
Expand Down
20 changes: 0 additions & 20 deletions docker/docker-img-stage-release.mk
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions docker/docker-img-stage3-cpp2v.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,13 @@ fm-$(BR_FMDEPS_VERSION)-stage3-release: fm-$(BR_FMDEPS_VERSION)-stage2-llvm-$(LL

DOCKER_BUILD_TARGETS += fm-$(BR_FMDEPS_VERSION)-stage3-release
DOCKER_PUSH_TARGETS += push-fm-$(BR_FMDEPS_VERSION)-stage3-release

.PHONY: fm-release
fm-release: fm-$(BR_FMDEPS_VERSION)-stage3-release
$(call tag-target,$<,$@)

DOCKER_BUILD_TARGETS += fm-release

ifeq ($(TAG_DEFAULTS),yes)
DOCKER_PUSH_TARGETS += push-fm-release
endif
2 changes: 1 addition & 1 deletion docker/opam_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ opam pin add -y -k rsync --recursive -n --with-version dev .

OPAM_PACKAGES=$(eval $2 | awk '{print $1}')

opam install -y ${OPAM_PACKAGES}
OCAMLRUNPARAM=b opam install --debug -y ${OPAM_PACKAGES}
/tmp/files/opam-clean

find $(opam var prefix) \( -path "*${ROCQ_LOG_PREFIX}*/*.v" -o -path "*${ROCQ_LOG_PREFIX}*/*.ml" \) -print0 |
Expand Down
Loading