Compare commits

..

No commits in common. "5280d47c1de98dae21084d693a7e6a23b3f9d983" and "d321b6660c5dae9bbb013af7c66692a2a5fa18de" have entirely different histories.

8 changed files with 706 additions and 723 deletions

View file

@ -3,8 +3,3 @@
.gitignore .gitignore
.git .git
docker-compose.build.yml docker-compose.build.yml
node_modules/
.env.example
LICENSE.md
docker-compose.yml
README.md

View file

@ -1 +0,0 @@
TAG=0.0.1

3
.gitignore vendored
View file

@ -1,4 +1,3 @@
node_modules/ node_modules/
dist/ dist/
service-worker.build.js service-worker.build.js
.env

View file

@ -1,10 +1,13 @@
pipeline: pipeline:
build: build:
image: alpine:3.14 image: node:20.2.0-alpine3.16
secrets: [docker_password, docker_username] secrets: [docker_password, docker_username]
commands: commands:
# Install deps # Install deps
- apk add docker docker-compose jq - apk add docker docker-compose jq
# Build app
- yarn install --frozen-lockfile
- yarn 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 - echo "TAG=$(jq -r .version ./package.json)" >> .env

View file

@ -1,16 +1,7 @@
FROM node:18 AS build FROM nginx
WORKDIR /usr
COPY package.json ./
COPY yarn.lock ./
RUN yarn install --frozen-lockfile
COPY . ./
RUN yarn build
FROM nginx:alpine
COPY --from=build /usr/dist /usr/share/nginx/html
#COPY nginx.conf /etc/nginx/nginx.conf
EXPOSE 80 EXPOSE 80
CMD ["nginx","-g","daemon off;"]
RUN rm -rf /usr/share/nginx/html/*
COPY ./dist/ /usr/share/nginx/html/

View file

@ -1,9 +0,0 @@
version: '3'
services:
web-app:
image: git.webdeploy.it/pianello/pianello-web-app:latest
restart: always
container_name: pianello-web-app
ports:
- 127.0.0.1:8080:80

View file

@ -9,7 +9,7 @@
}, },
"devDependencies": { "devDependencies": {
"vite": "^4.3.2", "vite": "^4.3.2",
"workbox-build": "^7.0.0", "workbox-build": "^6.6.1",
"workbox-precaching": "^7.0.0" "workbox-precaching": "^6.6.1"
} }
} }

1383
yarn.lock

File diff suppressed because it is too large Load diff