Compare commits

..

No commits in common. "d321b6660c5dae9bbb013af7c66692a2a5fa18de" and "909d978f4f780e5380f39a60aba0b322c2bd007c" have entirely different histories.

6 changed files with 4650 additions and 2630 deletions

View file

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

View file

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

View file

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

4645
package-lock.json generated Normal file

File diff suppressed because it is too large Load diff

View file

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

2619
yarn.lock

File diff suppressed because it is too large Load diff