Skip to content

Commit 9a892e8

Browse files
ReaversharkReavershark
committed
Add LDC support, everything (non-ubi9) uses latest ldc as bootstrap compiler, which is built with ldc 1.20, which is built with ldc 0.17
1 parent 9eaed35 commit 9a892e8

27 files changed

+718
-98
lines changed

‎scripts/COPYING.txt ‎COPYING.txt

File renamed without changes.

‎README.md

+25-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,30 @@
11
# dlang-dockerized
22

3-
Example
3+
Commands
44

55
```sh
6-
docker build . -f dockerfiles/dmd/2.105/bookworm/Dockerfile
6+
docker build -f dockerfiles/dmd/2.105/bookworm/Dockerfile . --tag=dlang/dmd:{2.105,latest}-bookworm
7+
docker build -f dockerfiles/dmd/2.105/ubi9/Dockerfile . --tag=dlang/dmd:{2.105,latest}-ubi9
8+
docker tag dlang/dmd:latest-bookworm dlang/dmd:latest
9+
10+
docker build -f dockerfiles/llvm/llvmorg-7.0.1/bookworm/Dockerfile . --tag=dlang/llvm:llvmorg-{7.0.1,7.0,7}-bookworm
11+
docker build -f dockerfiles/llvm/llvmorg-10.0.1/bookworm/Dockerfile . --tag=dlang/llvm:llvmorg-{10.0.1,10.0,10}-bookworm
12+
docker build -f dockerfiles/llvm/llvmorg-15.0.7/bookworm/Dockerfile . --tag=dlang/llvm:llvmorg-{15.0.7,15.0,15}-bookworm
13+
14+
docker build -f dockerfiles/ldc/0.17.6/bookworm/Dockerfile . --tag=dlang/ldc:{0.17.6,0.17,lts}-bookworm
15+
docker build -f dockerfiles/ldc/1.20.1/bookworm/Dockerfile . --tag=dlang/ldc:{1.20.1,1.20}-bookworm
16+
docker build -f dockerfiles/ldc/1.33.0/bookworm/Dockerfile . --tag=dlang/ldc:{1.33.0,1.33,latest}-bookworm
17+
docker tag dlang/ldc:latest-bookworm dlang/ldc:latest
18+
```
19+
20+
```
21+
system gcc → build ldc lts ← custom llvm 7
22+
↓
23+
system gcc → build ldc 1.20 ← custom llvm 10
24+
↓
25+
system gcc → build ldc stable ← custom llvm 15+
26+
↓
27+
system gcc → build ldc stable (again?) ← custom llvm 15+
28+
↓
29+
system gcc → build any other compilers
730
```

‎dockerfiles/dmd/2.105/bookworm/Dockerfile

+54-23
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,68 @@
1-
FROM docker.io/debian:bookworm AS builder
1+
###################
2+
# imported images #
3+
###################
24

3-
COPY ./scripts/install-system-tools.sh /opt/build/install-system-tools.sh
4-
RUN /opt/build/install-system-tools.sh
5+
FROM dlang/ldc:latest-bookworm AS ldc-bootstrap-imported
56

6-
ENV DL_DMD_TAG v2.105.0
7-
ENV DL_DUB_TAG v1.34.0
7+
###############
8+
# build stage #
9+
###############
10+
11+
FROM docker.io/debian:bookworm AS build-stage
812

913
WORKDIR /opt/build
1014

11-
COPY ./scripts/download-dmd.sh /opt/build/download-dmd.sh
12-
RUN ./download-dmd.sh
15+
# Install dependencies
16+
17+
COPY ./scripts/install-common-system-tools.sh .
18+
RUN ./install-common-system-tools.sh
19+
20+
# Copy prebuilt LDC from dlang/ldc
21+
COPY --from=ldc-bootstrap-imported /opt/ldc/ /opt/ldc-bootstrap/
22+
RUN sed -i 's/\/opt\/ldc/\/opt\/ldc-bootstrap/g' /opt/ldc-bootstrap/etc/ldc2.conf
23+
24+
# Download, build and install DMD
25+
26+
ENV DL_DMD_TAG v2.105.0
27+
28+
COPY ./scripts/download-dmd-source.sh .
29+
RUN ./download-dmd-source.sh
30+
31+
COPY ./scripts/build-dmd.sh .
32+
RUN ln -s /opt/ldc-bootstrap/bin/ldmd2 /usr/bin/dmd && \
33+
./build-dmd.sh && \
34+
rm -f /usr/bin/dmd
35+
36+
# Download, build and install DUB
37+
38+
ENV DL_DUB_TAG v1.34.0
39+
40+
COPY ./scripts/download-dub-source.sh .
41+
RUN ./download-dub-source.sh
1342

14-
COPY ./scripts/download-dub.sh /opt/build/download-dub.sh
15-
RUN ./download-dub.sh
43+
COPY ./scripts/build-dub.sh .
44+
RUN DMD=/opt/build/dmd/generated/linux/release/64/dmd ./build-dub.sh
1645

17-
COPY ./scripts/build-dmd.sh /opt/build/build-dmd.sh
18-
RUN ./build-dmd.sh
46+
################
47+
# export stage #
48+
################
1949

20-
COPY ./scripts/build-dub.sh /opt/build/build-dub.sh
21-
RUN ./build-dub.sh
50+
FROM docker.io/debian:bookworm AS export-stage
2251

23-
FROM docker.io/debian:bookworm AS runtime
2452
RUN apt-get update && apt-get -y install build-essential libphobos2-ldc-shared100
25-
COPY --from=builder /opt/build/dmd/generated/linux/release/64/dmd /usr/bin/dmd
26-
COPY --from=builder /opt/build/phobos/generated/linux/release/64/* /usr/lib/
27-
COPY --from=builder /opt/build/dmd/druntime/src /usr/include/dmd/druntime/import
28-
COPY --from=builder /opt/build/phobos/std /usr/include/dmd/phobos/std
29-
COPY --from=builder /opt/build/phobos/etc /usr/include/dmd/phobos/etc
30-
COPY --from=builder /opt/build/dub/bin/dub /usr/bin/dub
31-
COPY ./scripts/dmd.conf /etc/dmd.conf
32-
COPY ./scripts/helloworld.d /opt/helloworld.d
53+
COPY --from=build-stage /opt/build/dmd/generated/linux/release/64/dmd /usr/bin/dmd
54+
COPY --from=build-stage /opt/build/phobos/generated/linux/release/64/* /usr/lib/
55+
COPY --from=build-stage /opt/build/dmd/druntime/src /usr/include/dmd/druntime/import
56+
COPY --from=build-stage /opt/build/phobos/std /usr/include/dmd/phobos/std
57+
COPY --from=build-stage /opt/build/phobos/etc /usr/include/dmd/phobos/etc
58+
COPY --from=build-stage /opt/build/dub/bin/dub /usr/bin/dub
59+
COPY ./resources/dmd.conf /etc/dmd.conf
3360
COPY ./scripts/entrypoint-dmd.sh /usr/bin/entrypoint
34-
# self-test
61+
62+
# Self-test
63+
COPY ./resources/helloworld.d /opt/helloworld.d
3564
RUN dmd -run /opt/helloworld.d
65+
RUN rm /opt/helloworld.d
66+
3667
ENTRYPOINT [ "/usr/bin/entrypoint" ]
3768
CMD [ "/usr/bin/dmd" ]

‎dockerfiles/dmd/2.105/ubi9/Dockerfile

+48-25
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,63 @@
1-
FROM docker.io/redhat/ubi9:latest AS builder
1+
###############
2+
# build stage #
3+
###############
24

3-
COPY ./scripts/install-system-tools.sh /opt/build/install-system-tools.sh
4-
RUN /opt/build/install-system-tools.sh
5+
FROM docker.io/redhat/ubi9:latest AS build-stage
56

6-
COPY ./scripts/install-prebuilt-ldc.sh /opt/build/install-prebuilt-ldc.sh
7-
RUN /opt/build/install-prebuilt-ldc.sh
7+
WORKDIR /opt/build
88

9-
ENV DL_DMD_TAG v2.105.0
10-
ENV DL_DUB_TAG v1.34.0
9+
# Install dependencies
1110

12-
WORKDIR /opt/build
11+
COPY ./scripts/install-common-system-tools.sh .
12+
RUN ./install-common-system-tools.sh
1313

14-
COPY ./scripts/download-dmd.sh /opt/build/download-dmd.sh
15-
RUN ./download-dmd.sh
14+
COPY ./scripts/install-dmd-build-deps.sh .
15+
RUN ./install-dmd-build-deps.sh
16+
17+
COPY ./scripts/install-prebuilt-ldc.sh .
18+
RUN ./install-prebuilt-ldc.sh # TODO: replace with /opt/ldc from dlang/ldc:latest-ubi9
19+
20+
# Download, build and install DMD
21+
22+
ENV DL_DMD_TAG v2.105.0
1623

17-
COPY ./scripts/download-dub.sh /opt/build/download-dub.sh
18-
RUN ./download-dub.sh
24+
COPY ./scripts/download-dmd-source.sh .
25+
RUN ./download-dmd-source.sh
1926

20-
COPY ./scripts/build-dmd.sh /opt/build/build-dmd.sh
27+
COPY ./scripts/build-dmd.sh .
2128
RUN ./build-dmd.sh
2229

23-
COPY ./scripts/build-dub.sh /opt/build/build-dub.sh
24-
RUN ./build-dub.sh
30+
# Download, build and install DUB
31+
32+
ENV DL_DUB_TAG v1.34.0
33+
34+
COPY ./scripts/download-dub-source.sh .
35+
RUN ./download-dub-source.sh
36+
37+
COPY ./scripts/build-dub.sh .
38+
RUN DMD=/opt/build/dmd/generated/linux/release/64/dmd ./build-dub.sh
39+
40+
################
41+
# export stage #
42+
################
43+
44+
FROM docker.io/redhat/ubi9:latest AS export-stage
2545

26-
FROM docker.io/redhat/ubi9:latest AS runtime
2746
RUN dnf -y update && dnf -y install gcc make
28-
COPY --from=builder /opt/build/dmd/generated/linux/release/64/dmd /usr/bin/dmd
29-
COPY --from=builder /opt/build/phobos/generated/linux/release/64/* /usr/lib/
30-
COPY --from=builder /opt/build/dmd/druntime/src /usr/include/dmd/druntime/import
31-
COPY --from=builder /opt/build/phobos/std /usr/include/dmd/phobos/std
32-
COPY --from=builder /opt/build/phobos/etc /usr/include/dmd/phobos/etc
33-
COPY --from=builder /opt/build/dub/bin/dub /usr/bin/dub
34-
COPY ./scripts/dmd.conf /etc/dmd.conf
35-
COPY ./scripts/helloworld.d /opt/helloworld.d
47+
COPY --from=build-stage /opt/build/dmd/generated/linux/release/64/dmd /usr/bin/dmd
48+
COPY --from=build-stage /opt/build/phobos/generated/linux/release/64/* /usr/lib/
49+
COPY --from=build-stage /opt/build/dmd/druntime/src /usr/include/dmd/druntime/import
50+
COPY --from=build-stage /opt/build/phobos/std /usr/include/dmd/phobos/std
51+
COPY --from=build-stage /opt/build/phobos/etc /usr/include/dmd/phobos/etc
52+
COPY --from=build-stage /opt/build/dub/bin/dub /usr/bin/dub
53+
COPY ./resources/dmd.conf /etc/dmd.conf
54+
COPY ./resources/helloworld.d /opt/helloworld.d
3655
COPY ./scripts/entrypoint-dmd.sh /usr/bin/entrypoint
37-
# self-test
56+
57+
# Self-test
58+
COPY ./resources/helloworld.d /opt/helloworld.d
3859
RUN dmd -run /opt/helloworld.d
60+
RUN rm /opt/helloworld.d
61+
3962
ENTRYPOINT [ "/usr/bin/entrypoint" ]
4063
CMD [ "/usr/bin/dmd" ]

‎dockerfiles/ldc/0.17.6/bookworm/Dockerfile

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
###################
2+
# imported images #
3+
###################
4+
5+
FROM dlang/llvm:llvmorg-7.0-bookworm AS llvm-imported
6+
7+
###############
8+
# build stage #
9+
###############
10+
11+
FROM docker.io/debian:bookworm AS build-stage
12+
13+
WORKDIR /opt/build
14+
15+
# Install dependencies
16+
17+
COPY ./scripts/install-common-system-tools.sh .
18+
RUN ./install-common-system-tools.sh
19+
20+
COPY ./scripts/install-ldc-build-deps.sh .
21+
RUN ./install-ldc-build-deps.sh
22+
23+
# Copy prebuilt LLVM from dlang/llvm
24+
25+
COPY --from=llvm-imported /opt/llvm/ /opt/llvm/
26+
27+
# Download, build and install LCD
28+
29+
ENV DL_LDC_TAG v0.17.6
30+
ENV LDC_SEMVER_MAJOR 0
31+
ENV LDC_SEMVER_MINOR 17
32+
33+
COPY ./scripts/download-ldc-source.sh .
34+
RUN ./download-ldc-source.sh
35+
36+
COPY ./scripts/build-ldc.sh .
37+
RUN ./build-ldc.sh
38+
39+
# Self-test
40+
COPY ./resources/helloworld.d /opt/helloworld.d
41+
RUN /opt/ldc/bin/ldmd2 -run /opt/helloworld.d
42+
RUN rm /opt/helloworld.d
43+
44+
################
45+
# export stage #
46+
################
47+
48+
FROM docker.io/debian:bookworm AS export-stage
49+
50+
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && \
51+
apt-get -y install --no-install-recommends \
52+
build-essential libconfig++ && \
53+
rm -rf /var/lib/apt/lists/*
54+
55+
COPY --from=build-stage /opt/ldc /opt/ldc
56+
57+
# Self-test
58+
COPY ./resources/helloworld.d /opt/helloworld.d
59+
RUN /opt/ldc/bin/ldmd2 -run /opt/helloworld.d
60+
RUN rm /opt/helloworld.d
61+
62+
COPY ./scripts/entrypoint-ldc.sh /usr/bin/entrypoint
63+
64+
ENTRYPOINT [ "/usr/bin/entrypoint" ]
65+
CMD [ "/opt/ldc/bin/ldc2" ]

‎dockerfiles/ldc/1.20.1/bookworm/Dockerfile

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
###################
2+
# imported images #
3+
###################
4+
5+
FROM dlang/llvm:llvmorg-10.0-bookworm AS llvm-imported
6+
FROM dlang/ldc:lts-bookworm AS ldc-bootstrap-imported
7+
8+
###############
9+
# build stage #
10+
###############
11+
12+
FROM docker.io/debian:bookworm AS build-stage
13+
14+
WORKDIR /opt/build
15+
16+
# Install dependencies
17+
18+
COPY ./scripts/install-common-system-tools.sh .
19+
RUN ./install-common-system-tools.sh
20+
21+
COPY ./scripts/install-ldc-build-deps.sh .
22+
RUN ./install-ldc-build-deps.sh
23+
24+
# Copy prebuilt LLVM from dlang/llvm
25+
26+
COPY --from=llvm-imported /opt/llvm/ /opt/llvm/
27+
28+
# Copy prebuilt LDC from dlang/ldc
29+
30+
COPY --from=ldc-bootstrap-imported /opt/ldc/ /opt/ldc-bootstrap/
31+
RUN sed -i 's/\/opt\/ldc/\/opt\/ldc-bootstrap/g' /opt/ldc-bootstrap/etc/ldc2.conf
32+
33+
# Download, build and install LCD
34+
35+
ENV DL_LDC_TAG v1.20.1
36+
ENV LDC_SEMVER_MAJOR 1
37+
ENV LDC_SEMVER_MINOR 20
38+
39+
COPY ./scripts/download-ldc-source.sh .
40+
RUN ./download-ldc-source.sh
41+
42+
COPY ./scripts/build-ldc.sh .
43+
RUN DMD=/opt/ldc-bootstrap/bin/ldmd2 ./build-ldc.sh
44+
45+
# Self-test
46+
COPY ./resources/helloworld.d /opt/helloworld.d
47+
RUN /opt/ldc/bin/ldmd2 -run /opt/helloworld.d
48+
RUN rm /opt/helloworld.d
49+
50+
################
51+
# export stage #
52+
################
53+
54+
FROM docker.io/debian:bookworm AS export-stage
55+
56+
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && \
57+
apt-get -y install --no-install-recommends \
58+
build-essential && \
59+
rm -rf /var/lib/apt/lists/*
60+
61+
COPY --from=build-stage /opt/ldc /opt/ldc
62+
63+
# Self-test
64+
COPY ./resources/helloworld.d /opt/helloworld.d
65+
RUN /opt/ldc/bin/ldmd2 -run /opt/helloworld.d
66+
RUN rm /opt/helloworld.d
67+
68+
COPY ./scripts/entrypoint-ldc.sh /usr/bin/entrypoint
69+
70+
ENTRYPOINT [ "/usr/bin/entrypoint" ]
71+
CMD [ "/opt/ldc/bin/ldc2" ]

0 commit comments

Comments
 (0)