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

WIP Try to built a new htdocs-frontend tarball
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
nemunaire 2021-09-24 19:05:08 +02:00
commit e29802b731
5 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.drone.yml
View file

@ -54,7 +54,6 @@ steps:
image: golang:alpine image: golang:alpine
commands: commands:
- go build -v -o deploy/frontend-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/frontend - go build -v -o deploy/frontend-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/frontend
- tar chjf deploy/htdocs-frontend.tar.bz2 htdocs-frontend
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
@ -66,6 +65,7 @@ steps:
- 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 - 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
- tar chjf ../../deploy/htdocs-frontend.tar.bz2 build
- name: build dashboard - name: build dashboard
image: golang:alpine image: golang:alpine

10
Dockerfile-dashboard
View file

@ -24,9 +24,9 @@ ENTRYPOINT ["/srv/dashboard", "--bind=:8082"]
VOLUME /srv/htdocs-dashboard/ VOLUME /srv/htdocs-dashboard/
COPY --from=gobuild /go/src/srs.epita.fr/fic-server/dashboard/dashboard /srv/dashboard COPY --from=gobuild /go/src/srs.epita.fr/fic-server/dashboard/dashboard /srv/dashboard
COPY dashboard/static/index.html /srv/htdocs-dashboard/ COPY dashboard/static/index.html frontend/ui/static/favicon.ico /srv/htdocs-dashboard/
COPY dashboard/static/css/bootstrap.min.css frontend/static/css/fic.css frontend/static/css/glyphicon.css /srv/htdocs-dashboard/css/ COPY admin/static/css/bootstrap.min.css qa/static/css/fic.css admin/static/css/glyphicon.css /srv/htdocs-dashboard/css/
COPY frontend/static/fonts /srv/htdocs-dashboard/fonts COPY admin/static/fonts /srv/htdocs-dashboard/fonts
COPY frontend/static/img/ dashboard/static/img/logo-epita-bw.png dashboard/static/img/sii.png /srv/htdocs-dashboard/img/ COPY frontend/ui/static/img/ dashboard/static/img/logo-epita-bw.png dashboard/static/img/sii.png /srv/htdocs-dashboard/img/
COPY dashboard/static/js/dashboard.js frontend/static/js/angular.min.js dashboard/static/js/angular-animate.min.js frontend/static/js/angular-route.min.js frontend/static/js/angular-sanitize.min.js frontend/static/js/bootstrap.min.js frontend/static/js/common.js frontend/static/js/d3.v3.min.js frontend/static/js/jquery.min.js /srv/htdocs-dashboard/js/ COPY dashboard/static/js/dashboard.js admin/static/js/angular.min.js dashboard/static/js/angular-animate.min.js admin/static/js/angular-route.min.js admin/static/js/angular-sanitize.min.js admin/static/js/bootstrap.min.js admin/static/js/common.js admin/static/js/d3.v3.min.js admin/static/js/jquery.min.js /srv/htdocs-dashboard/js/
COPY admin/static/js/i18n/* /srv/htdocs-dashboard/js/i18n/ COPY admin/static/js/i18n/* /srv/htdocs-dashboard/js/i18n/

2
Dockerfile-frontend
View file

@ -24,6 +24,4 @@ CMD ["--bind=:8080"]
COPY entrypoint-frontend.sh /usr/sbin/entrypoint.sh COPY entrypoint-frontend.sh /usr/sbin/entrypoint.sh
VOLUME /srv/htdocs-frontend/
COPY --from=gobuild /go/src/srs.epita.fr/fic-server/frontend/frontend /srv/frontend COPY --from=gobuild /go/src/srs.epita.fr/fic-server/frontend/frontend /srv/frontend

10
Dockerfile-qa
View file

@ -24,9 +24,9 @@ ENTRYPOINT ["/srv/qa", "--bind=:8083"]
VOLUME /srv/htdocs-qa/ VOLUME /srv/htdocs-qa/
COPY --from=gobuild /go/src/srs.epita.fr/fic-server/qa/qa /srv/qa COPY --from=gobuild /go/src/srs.epita.fr/fic-server/qa/qa /srv/qa
COPY qa/static/index.html /srv/htdocs-qa/ COPY qa/static/index.html frontend/ui/static/favicon.ico /srv/htdocs-qa/
COPY qa/static/css/bootstrap.min.css frontend/static/css/fic.css frontend/static/css/glyphicon.css /srv/htdocs-qa/css/ COPY admin/static/css/bootstrap.min.css qa/static/css/fic.css admin/static/css/glyphicon.css /srv/htdocs-qa/css/
COPY frontend/static/fonts /srv/htdocs-qa/fonts COPY admin/static/fonts /srv/htdocs-qa/fonts
COPY frontend/static/img/ /srv/htdocs-qa/img/ COPY frontend/ui/static/img/ /srv/htdocs-qa/img/
COPY qa/static/js/qa.js frontend/static/js/angular.min.js qa/static/js/angular-resource.min.js frontend/static/js/angular-route.min.js frontend/static/js/angular-sanitize.min.js frontend/static/js/bootstrap.min.js frontend/static/js/common.js frontend/static/js/i18n frontend/static/js/jquery.min.js /srv/htdocs-qa/js/ COPY qa/static/js/qa.js admin/static/js/angular.min.js qa/static/js/angular-resource.min.js admin/static/js/angular-route.min.js admin/static/js/angular-sanitize.min.js admin/static/js/bootstrap.min.js admin/static/js/common.js admin/static/js/i18n admin/static/js/jquery.min.js /srv/htdocs-qa/js/
COPY qa/static/views/ /srv/htdocs-qa/views/ COPY qa/static/views/ /srv/htdocs-qa/views/

1
frontend/ui/src/components/ExerciceVideo.svelte
View file

@ -21,4 +21,5 @@
<iframe type="text/html" src="{uri}" class="embed-responsive-item" title="Vidéo de résolution"> <iframe type="text/html" src="{uri}" class="embed-responsive-item" title="Vidéo de résolution">
Regardez la vidéo de résolution de ce défi&nbsp;: <a href="{uri}">{uri}</a>. Regardez la vidéo de résolution de ce défi&nbsp;: <a href="{uri}">{uri}</a>.
</iframe> </iframe>
</CardBody>
</Card> </Card>