Compare commits

...

8 commits

Author SHA1 Message Date
d321b6660c Use yarn instead
All checks were successful
ci/woodpecker/push/build Pipeline was successful
2023-05-31 18:01:23 +02:00
c3428e1b0a Add TAG to .env for build
All checks were successful
ci/woodpecker/push/build Pipeline was successful
2023-05-31 17:59:52 +02:00
bdc5897f5a Remove name of container to build
Some checks failed
ci/woodpecker/push/build Pipeline failed
2023-05-31 17:58:13 +02:00
377d8601a7 build image for current tag also
Some checks failed
ci/woodpecker/push/build Pipeline failed
2023-05-31 17:33:26 +02:00
9bfba0ac38
Fix dist path in Dockerfile
Some checks failed
ci/woodpecker/push/build Pipeline failed
2023-05-31 16:26:03 +02:00
16fd12287e
Edit build command
Some checks failed
ci/woodpecker/push/build Pipeline failed
2023-05-31 16:04:56 +02:00
ce515400d8 Merge pull request 'Add PWA support' (#3) from develop into main
Some checks failed
ci/woodpecker/push/build Pipeline failed
Reviewed-on: #3
2023-05-31 16:02:23 +02:00
6bac5e2a34 Merge pull request 'Fix bottom app bar position' (#2) from develop into main
All checks were successful
ci/woodpecker/push/build Pipeline was successful
Reviewed-on: #2
2023-05-31 14:41:50 +02:00
6 changed files with 2630 additions and 4650 deletions

View file

@ -6,13 +6,15 @@ pipeline:
# Install deps
- apk add docker docker-compose jq
# Build app
- npm i
- npm run build
- yarn install --frozen-lockfile
- yarn build
# Log into docker registry
- echo "$${DOCKER_PASSWORD}" | docker login --password-stdin --username "$${DOCKER_USERNAME}" git.webdeploy.it
- echo "TAG=$(jq -r .version ./package.json)" >> .env
# Build image
- docker-compose -f docker-compose.build.yml build pianello-web-app
- docker-compose -f docker-compose.build.yml build
- docker push git.webdeploy.it/pianello/pianello-web-app:latest
- docker push git.webdeploy.it/pianello/pianello-web-app:$(jq -r .version ./package.json)
volumes:
- /var/run/docker.sock:/var/run/docker.sock

View file

@ -4,4 +4,4 @@ EXPOSE 80
RUN rm -rf /usr/share/nginx/html/*
COPY ./build/ /usr/share/nginx/html/
COPY ./dist/ /usr/share/nginx/html/

View file

@ -7,3 +7,7 @@ services:
build:
context: .
dockerfile: Dockerfile
version_tag:
extends: pianello-web-app
image: git.webdeploy.it/pianello/pianello-web-app:${TAG}

4645
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -5,7 +5,7 @@
"type": "module",
"scripts": {
"dev": "vite --host 0.0.0.0",
"build": "vite build && build-sw.js"
"build": "vite build && ./build-sw.js"
},
"devDependencies": {
"vite": "^4.3.2",

2619
yarn.lock Normal file

File diff suppressed because it is too large Load diff