talexander/organic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Use ADD command for pulling git repos.

Browse Source 
This is to fix buildkit caching.
This commit is contained in:
Tom Alexander
2026-07-09 21:32:52 -04:00
parent 49fbb17672
commit 656e26e26f
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
docker/organic_test/Dockerfile
View File

@@ -17,15 +17,17 @@ RUN apk add --no-cache build-base musl-dev git autoconf make texinfo gnutls-dev
FROM build AS build-emacs FROM build AS build-emacs
ARG EMACS_VERSION
ARG EMACS_REPO ARG EMACS_REPO
RUN git clone --depth 1 --branch $EMACS_VERSION $EMACS_REPO /root/emacs ARG EMACS_VERSION
ADD "$EMACS_REPO#$EMACS_VERSION" /root/emacs
WORKDIR /root/emacs WORKDIR /root/emacs
RUN mkdir /root/dist RUN <<EOF
RUN ./autogen.sh mkdir /root/dist
RUN ./configure --prefix /usr --without-x --without-sound --with-native-compilation=aot ./autogen.sh
RUN make ./configure --prefix /usr --without-x --without-sound --with-native-compilation=aot
RUN make DESTDIR="/root/dist" install make
make DESTDIR="/root/dist" install
EOF
FROM build AS build-org-mode FROM build AS build-org-mode
@@ -37,8 +39,10 @@ RUN mkdir /root/dist
RUN git clone $ORG_MODE_REPO /root/org-mode && git -C /root/org-mode checkout $ORG_VERSION RUN git clone $ORG_MODE_REPO /root/org-mode && git -C /root/org-mode checkout $ORG_VERSION
# RUN mkdir /root/org-mode && git -C /root/org-mode init --initial-branch=main && git -C /root/org-mode remote add origin $ORG_REPO && git -C /root/org-mode fetch origin $ORG_VERSION && git -C /root/org-mode checkout FETCH_HEAD # RUN mkdir /root/org-mode && git -C /root/org-mode init --initial-branch=main && git -C /root/org-mode remote add origin $ORG_REPO && git -C /root/org-mode fetch origin $ORG_VERSION && git -C /root/org-mode checkout FETCH_HEAD
WORKDIR /root/org-mode WORKDIR /root/org-mode
RUN make compile RUN <<EOF
RUN make DESTDIR="/root/dist" install make compile
make DESTDIR="/root/dist" install
EOF
FROM rustlang/rust:nightly-alpine$ALPINE_VERSION AS tester FROM rustlang/rust:nightly-alpine$ALPINE_VERSION AS tester
@@ -118,8 +122,10 @@ RUN mkdir -p $LITERATE_BUILD_EMACS_PATH && git -C $LITERATE_BUILD_EMACS_PATH ini
RUN rm $LITERATE_BUILD_EMACS_PATH/unused/aws.org RUN rm $LITERATE_BUILD_EMACS_PATH/unused/aws.org
FROM tester as foreign-document FROM tester as foreign-document
RUN apk add --no-cache bash coreutils RUN <<EOF
RUN mkdir /foreign_documents apk add --no-cache bash coreutils
mkdir /foreign_documents
EOF
COPY --link --from=foreign-document-gather /foreign_documents/howardabrams /foreign_documents/howardabrams COPY --link --from=foreign-document-gather /foreign_documents/howardabrams /foreign_documents/howardabrams
COPY --link --from=foreign-document-gather /foreign_documents/doomemacs /foreign_documents/doomemacs COPY --link --from=foreign-document-gather /foreign_documents/doomemacs /foreign_documents/doomemacs
COPY --link --from=foreign-document-gather /foreign_documents/worg /foreign_documents/worg COPY --link --from=foreign-document-gather /foreign_documents/worg /foreign_documents/worg