Use ADD command for pulling git repos.
This is to fix buildkit caching.
This commit is contained in:
@@ -17,15 +17,17 @@ RUN apk add --no-cache build-base musl-dev git autoconf make texinfo gnutls-dev
|
||||
|
||||
|
||||
FROM build AS build-emacs
|
||||
ARG EMACS_VERSION
|
||||
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
|
||||
RUN mkdir /root/dist
|
||||
RUN ./autogen.sh
|
||||
RUN ./configure --prefix /usr --without-x --without-sound --with-native-compilation=aot
|
||||
RUN make
|
||||
RUN make DESTDIR="/root/dist" install
|
||||
RUN <<EOF
|
||||
mkdir /root/dist
|
||||
./autogen.sh
|
||||
./configure --prefix /usr --without-x --without-sound --with-native-compilation=aot
|
||||
make
|
||||
make DESTDIR="/root/dist" install
|
||||
EOF
|
||||
|
||||
|
||||
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 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
|
||||
RUN make compile
|
||||
RUN make DESTDIR="/root/dist" install
|
||||
RUN <<EOF
|
||||
make compile
|
||||
make DESTDIR="/root/dist" install
|
||||
EOF
|
||||
|
||||
|
||||
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
|
||||
|
||||
FROM tester as foreign-document
|
||||
RUN apk add --no-cache bash coreutils
|
||||
RUN mkdir /foreign_documents
|
||||
RUN <<EOF
|
||||
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/doomemacs /foreign_documents/doomemacs
|
||||
COPY --link --from=foreign-document-gather /foreign_documents/worg /foreign_documents/worg
|
||||
|
||||
Reference in New Issue
Block a user