diff --git a/docker/organic_test/Dockerfile b/docker/organic_test/Dockerfile index 1154158..b62517e 100644 --- a/docker/organic_test/Dockerfile +++ b/docker/organic_test/Dockerfile @@ -36,16 +36,28 @@ ENTRYPOINT ["cargo", "test"] FROM build as foreign-document-gather + ARG HOWARD_ABRAMS_DOT_FILES_VERSION=1b54fe75d74670dc7bcbb6b01ea560c45528c628 ARG HOWARD_ABRAMS_DOT_FILES_PATH=/foreign_documents/howardabrams/dot-files ARG HOWARD_ABRAMS_DOT_FILES_REPO=https://github.com/howardabrams/dot-files.git RUN mkdir /foreign_documents RUN mkdir -p $HOWARD_ABRAMS_DOT_FILES_PATH && git -C $HOWARD_ABRAMS_DOT_FILES_PATH init --initial-branch=main && git -C $HOWARD_ABRAMS_DOT_FILES_PATH remote add origin $HOWARD_ABRAMS_DOT_FILES_REPO && git -C $HOWARD_ABRAMS_DOT_FILES_PATH fetch origin $HOWARD_ABRAMS_DOT_FILES_VERSION && git -C $HOWARD_ABRAMS_DOT_FILES_PATH checkout FETCH_HEAD + ARG HOWARD_ABRAMS_HAMACS_VERSION=da51188cc195d41882175d412fe40a8bc5730c5c ARG HOWARD_ABRAMS_HAMACS_PATH=/foreign_documents/howardabrams/hamacs ARG HOWARD_ABRAMS_HAMACS_REPO=https://github.com/howardabrams/hamacs.git RUN mkdir -p $HOWARD_ABRAMS_HAMACS_PATH && git -C $HOWARD_ABRAMS_HAMACS_PATH init --initial-branch=main && git -C $HOWARD_ABRAMS_HAMACS_PATH remote add origin $HOWARD_ABRAMS_HAMACS_REPO && git -C $HOWARD_ABRAMS_HAMACS_PATH fetch origin $HOWARD_ABRAMS_HAMACS_VERSION && git -C $HOWARD_ABRAMS_HAMACS_PATH checkout FETCH_HEAD +ARG HOWARD_ABRAMS_DEMO_IT_VERSION=e399fd7ceb73caeae7cb50b247359bafcaee2a3f +ARG HOWARD_ABRAMS_DEMO_IT_PATH=/foreign_documents/howardabrams/demo-it +ARG HOWARD_ABRAMS_DEMO_IT_REPO=https://github.com/howardabrams/demo-it.git +RUN mkdir -p $HOWARD_ABRAMS_DEMO_IT_PATH && git -C $HOWARD_ABRAMS_DEMO_IT_PATH init --initial-branch=main && git -C $HOWARD_ABRAMS_DEMO_IT_PATH remote add origin $HOWARD_ABRAMS_DEMO_IT_REPO && git -C $HOWARD_ABRAMS_DEMO_IT_PATH fetch origin $HOWARD_ABRAMS_DEMO_IT_VERSION && git -C $HOWARD_ABRAMS_DEMO_IT_PATH checkout FETCH_HEAD + +ARG DOOMEMACS_VERSION=42d5fd83504f8aa80f3248036006fbcd49222943 +ARG DOOMEMACS_PATH=/foreign_documents/doomemacs +ARG DOOMEMACS_REPO=https://github.com/doomemacs/doomemacs.git +RUN mkdir -p $DOOMEMACS_PATH && git -C $DOOMEMACS_PATH init --initial-branch=main && git -C $DOOMEMACS_PATH remote add origin $DOOMEMACS_REPO && git -C $DOOMEMACS_PATH fetch origin $DOOMEMACS_VERSION && git -C $DOOMEMACS_PATH checkout FETCH_HEAD + FROM tester as foreign-document-test RUN apk add --no-cache bash coreutils @@ -53,6 +65,7 @@ RUN mkdir /foreign_documents COPY --from=build-org-mode /root/org-mode /foreign_documents/org-mode COPY --from=build-emacs /root/emacs /foreign_documents/emacs COPY --from=foreign-document-gather /foreign_documents/howardabrams /foreign_documents/howardabrams +COPY --from=foreign-document-gather /foreign_documents/doomemacs /foreign_documents/doomemacs COPY foreign_document_test_entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/docker/organic_test/foreign_document_test_entrypoint.sh b/docker/organic_test/foreign_document_test_entrypoint.sh index 8e56197..1fcde1f 100644 --- a/docker/organic_test/foreign_document_test_entrypoint.sh +++ b/docker/organic_test/foreign_document_test_entrypoint.sh @@ -34,6 +34,8 @@ function main { if [ "$?" -ne 0 ]; then all_status=1; fi (run_compare_function "howard_abrams" compare_howard_abrams) if [ "$?" -ne 0 ]; then all_status=1; fi + (run_compare_function "doomemacs" compare_all_org_document "/foreign_documents/doomemacs") + if [ "$?" -ne 0 ]; then all_status=1; fi set -e if [ "$all_status" -ne 0 ]; then @@ -117,10 +119,12 @@ function compare_howard_abrams { local all_status=0 set +e - (run_compare_function "dot_files" compare_all_org_document "/foreign_documents/howardabrams/dot-files") + (run_compare_function "dot-files" compare_all_org_document "/foreign_documents/howardabrams/dot-files") if [ "$?" -ne 0 ]; then all_status=1; fi (run_compare_function "hamacs" compare_all_org_document "/foreign_documents/howardabrams/hamacs") if [ "$?" -ne 0 ]; then all_status=1; fi + (run_compare_function "demo-it" compare_all_org_document "/foreign_documents/howardabrams/demo-it") + if [ "$?" -ne 0 ]; then all_status=1; fi set -e return "$all_status"