feat: use antd http server v2.0.0 with all plugins updated
gitea-sync/antos/pipeline/head This commit looks good Details
gitea-sync/antos/pipeline/tag This commit looks good Details

This commit is contained in:
DanyLE 2024-03-13 18:42:33 +01:00
parent 3c7afca22a
commit 9882eb4a8f
8 changed files with 57 additions and 18 deletions

View File

@ -61,7 +61,7 @@ plugins: antd-fcgi-plugin antd-tunnel-plugin antd-wvnc-plugin antd-tunnel-publis
luasec: clean_c
@echo "Building $@"
lua5.3 $(ROOT_DIR)/antd/luasec/src/options.lua -g \
lua $(ROOT_DIR)/antd/luasec/src/options.lua -g \
/usr/include/openssl/ssl.h \
> $(ROOT_DIR)/antd/luasec/src/options.c
CC=$(CC) \
@ -100,7 +100,9 @@ luasocket: clean_c
antd-% sil%: clean_c
@echo "Building $@"
cd $(ROOT_DIR)/antd/$@ && libtoolize && aclocal && autoconf && automake --add-missing
cd $(ROOT_DIR)/antd/$@ && CFLAGS="-I$(INSTALL_DIR)/include" LDFLAGS="-L$(INSTALL_DIR)/lib" \
cd $(ROOT_DIR)/antd/$@ && \
CFLAGS="-I$(INSTALL_DIR)/include"\
LDFLAGS="-L$(INSTALL_DIR)/lib" \
./configure $(HOST) --prefix=$(BUILD_PREFIX)
DESTDIR=$(BUILDDIR)/$(ARCH) make -C $(ROOT_DIR)/antd/$@ install
@ -178,15 +180,7 @@ appimg:
scripts/mkappimg.sh $(ARCH) $(VERSION_STR) $(BUILDDIR)/$(ARCH) $(ROOT_DIR)/antos-64.png
docker:
ln -sfn arm $(BUILDDIR)/armv7l
ln -sfn arm64 $(BUILDDIR)/aarch64
ln -sfn amd64 $(BUILDDIR)/x86_64
docker buildx build \
--platform linux/arm/v7,linux/arm64/v8,linux/amd64 \
--tag $(DOCKER_IMAGE):$(DOCKER_TAG) \
-f docker/antos/Dockerfile \
--push \
.
rm $(BUILDDIR)/aarch64 $(BUILDDIR)/armv7l $(BUILDDIR)/x86_64
scripts/mkdocker.sh $(DOCKER_IMAGE):$(DOCKER_TAG)
# --push
.PHONY: antd antos docker

@ -1 +1 @@
Subproject commit 32552ee0ed78fd76b8c8524280d3d07d9f3d1ab7
Subproject commit 58a7738afee006a1a816bfab15ae54e879eb723a

@ -1 +1 @@
Subproject commit bfa6020ce271ed8f3a3d28761fd1bcfef494c394
Subproject commit 6a82a98aa5e7dfb7d274151260f4b33111229a77

@ -1 +1 @@
Subproject commit 8da0bf39340f78410e6419876bd6c18bc8eb93ca
Subproject commit de2c072d6df07840784274797bf5bfaaefb8fda1

@ -1 +1 @@
Subproject commit 6c1df8e4d558fd88d94f3a78a504c922b4b2aa13
Subproject commit d08ae89c82232c53c63c658c7ab26175440702a6

@ -1 +1 @@
Subproject commit bf5284e66f4631e10488884e5bd22d4ac2407810
Subproject commit 6380787d7e0ba67146a0a9343675aac5c8c12aec

View File

@ -1,7 +1,6 @@
[SERVER]
plugins=/opt/www/lib/
plugins_ext=.so
database=/opt/www/database/
tmpdir=/tmp/
maxcon=500
backlog=5000

46
scripts/mkdocker.sh Executable file
View File

@ -0,0 +1,46 @@
#!/bin/bash
set -e
DOCKER_IMAGE=$1
if [ -z "$DOCKER_IMAGE" ]; then
echo "Please provide <image>:<tag> as parameter"
exit 1
fi
rm build/aarch64 build/armv7l build/x86_64 || true
list=$(ls build/)
platforms=
for item in $list; do
case $item in
amd64)
platforms="$platforms,linux/amd64"
;;
arm64)
platforms="$platforms,linux/arm64/v8"
;;
arm)
platforms="$platforms,linux/arm/v7"
;;
*)
echo "Unkown architecture $item"
exit 1
;;
esac
done
platforms=${platforms##,}
echo "Building docker image for the following platforms: $platforms"
ln -sfn arm build/armv7l
ln -sfn arm64 build/aarch64
ln -sfn amd64 build/x86_64
docker buildx build \
--platform "$platforms" \
--tag "$DOCKER_IMAGE" \
-f docker/antos/Dockerfile \
--push \
.