remove submodule due to build weirdness

This commit is contained in:
Kegan Myers 2023-07-23 09:07:47 -05:00
parent 7ab1ecf787
commit 2389535593
3 changed files with 9 additions and 8 deletions

6
.gitmodules vendored
View file

@ -1,6 +0,0 @@
[submodule "src"]
path = src
url = https://akkoma.dev/AkkomaGang/akkoma.git
[submodule "akkoma"]
path = akkoma
url = https://akkoma.dev/AkkomaGang/akkoma.git

1
akkoma

@ -1 +0,0 @@
Subproject commit 9d7c877de049303a4d4d8f5ecaac7da94ca59ebb

View file

@ -1,12 +1,20 @@
#!/bin/bash #!/bin/bash
set -Eeuxo pipefail set -Eeuxo pipefail
AKKOMA_COMMIT=$(cd akkoma; git rev-parse HEAD) AKKOMA_COMMIT="9d7c877de049303a4d4d8f5ecaac7da94ca59ebb"
LOCAL_COMMIT=$(git rev-parse HEAD) LOCAL_COMMIT=$(git rev-parse HEAD)
AKKOMA_BASE_IMAGE="registry.nrd.li/nrdli/akkoma-base:${AKKOMA_COMMIT}" AKKOMA_BASE_IMAGE="registry.nrd.li/nrdli/akkoma-base:${AKKOMA_COMMIT}"
AKKOMA_FINAL_IMAGE="registry.nrd.li/nrdli/akkoma:${LOCAL_COMMIT}" AKKOMA_FINAL_IMAGE="registry.nrd.li/nrdli/akkoma:${LOCAL_COMMIT}"
if [ ! -d akkoma ]; then
git clone https://akkoma.dev/AkkomaGang/akkoma.git akkoma
fi
pushd akkoma pushd akkoma
git fetch --all
git checkout "${AKKOMA_COMMIT}"
if [ "$(git rev-parse HEAD)" != "${AKKOMA_COMMIT}" ]; then
exit 1
fi
docker build \ docker build \
-t "${AKKOMA_BASE_IMAGE}" \ -t "${AKKOMA_BASE_IMAGE}" \
. .