Merge branch 'main' of github.com:ccfos/nightingale

docker/Dockerfile.goreleaser

@@ -2,11 +2,11 @@ FROM --platform=$TARGETPLATFORM python:3-slim
 
 
 WORKDIR /app
-ADD n9e /app
-ADD etc /app
-ADD integrations /app
+ADD n9e /app/
+ADD etc /app/
+ADD integrations /app/integrations/
 ADD --chmod=755 https://github.com/ufoscout/docker-compose-wait/releases/download/2.11.0/wait_x86_64 /wait
-ADD pub /app
+ADD pub /app/pub/
 
 EXPOSE 17000
 

docker/Dockerfile.goreleaser.arm64

@@ -2,11 +2,11 @@ FROM --platform=$TARGETPLATFORM python:3-slim
 
 
 WORKDIR /app
-ADD n9e /app
-ADD etc /app
-ADD integrations /app
+ADD n9e /app/
+ADD etc /app/
+ADD integrations /app/integrations/
 ADD --chmod=755 https://github.com/ufoscout/docker-compose-wait/releases/download/2.11.0/wait_aarch64 /wait
-ADD pub /app
+ADD pub /app/pub/
 
 EXPOSE 17000
 

fe.sh

@@ -8,8 +8,3 @@ curl -o n9e-fe-${VERSION}.tar.gz -L https://github.com/n9e/fe/releases/download/
 tar zxvf n9e-fe-${VERSION}.tar.gz
 
 cp ./docker/initsql/a-n9e.sql n9e.sql
-
-TAG=$(curl -sX GET https://api.github.com/repos/ccfos/nightingale/releases/latest   | awk '/tag_name/{print $4;exit}' FS='[""]')
-VERSION=$(echo $TAG)
-VERSION=${VERSION/v/}
-sed -i "s/nightingale:latest/nightingale:${VERSION}/g" ./docker/docker-compose.yaml
\ No newline at end of file