fic/server
1
0
Fork 0
Code Issues Pull Requests 10 Releases Wiki Activity

CI: Fix compilation problems

Browse Source
This commit is contained in:
nemunaire 2021-09-01 01:27:24 +02:00
parent a255480195
commit 3c42bef298
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.yml
View File

@ -64,6 +64,7 @@ steps:
- apk --no-cache add python2 build-base - apk --no-cache add python2 build-base
- cd frontend/ui - cd frontend/ui
- npm install --network-timeout=100000 - npm install --network-timeout=100000
- sed -i 's!@popperjs/core/dist/esm/popper!@popperjs/core!' node_modules/sveltestrap/src/*.js node_modules/sveltestrap/src/*.svelte
- npm run build - npm run build
- name: build dashboard - name: build dashboard
@ -273,6 +274,7 @@ steps:
- apk --no-cache add python2 build-base - apk --no-cache add python2 build-base
- cd frontend/ui - cd frontend/ui
- npm install --network-timeout=100000 - npm install --network-timeout=100000
- sed -i 's!@popperjs/core/dist/esm/popper!@popperjs/core!' node_modules/sveltestrap/src/*.js node_modules/sveltestrap/src/*.svelte
- npm run build - npm run build
- name: build dashboard - name: build dashboard

5
Dockerfile-nginx
View File

@ -6,8 +6,9 @@ RUN apk --no-cache add python2 build-base
COPY frontend/ui/ . COPY frontend/ui/ .
RUN npm install --network-timeout 100000 RUN npm install --network-timeout=100000 && \
RUN npm run build sed -i 's!@popperjs/core/dist/esm/popper!@popperjs/core!' node_modules/sveltestrap/src/*.js node_modules/sveltestrap/src/*.svelte && \
npm run build
FROM nginx:stable-alpine FROM nginx:stable-alpine

2
admin/main.go
View File

@ -135,6 +135,7 @@ func main() {
if sDir, err := filepath.Abs(*staticDir); err != nil { if sDir, err := filepath.Abs(*staticDir); err != nil {
log.Fatal(err) log.Fatal(err)
} else { } else {
log.Println("Serving pages from", sDir)
staticFS = http.Dir(sDir) staticFS = http.Dir(sDir)
sync.DeepReportPath = path.Join(sDir, sync.DeepReportPath) sync.DeepReportPath = path.Join(sDir, sync.DeepReportPath)
} }
@ -143,6 +144,7 @@ func main() {
if err != nil { if err != nil {
log.Fatal("Unable to cd to static/ directory:", err) log.Fatal("Unable to cd to static/ directory:", err)
} }
log.Println("Serving pages from memory.")
staticFS = http.FS(sub) staticFS = http.FS(sub)
sync.DeepReportPath = path.Join("SYNC", sync.DeepReportPath) sync.DeepReportPath = path.Join("SYNC", sync.DeepReportPath)
} }