Skip to content

Commit

Permalink
New web interface based on vue (#50)
Browse files Browse the repository at this point in the history
* Initial vue project
* Add router
* Remove AngularJS app
* Remove app dependencies
* update packages
* Update CHANGELOG.md
* Update version
  • Loading branch information
chriskinsman authored Oct 14, 2021
1 parent 3ff5584 commit c8b362c
Show file tree
Hide file tree
Showing 71 changed files with 15,429 additions and 2,702 deletions.
9 changes: 7 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,16 @@ npm-debug.log*
# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
node_modules
app/node_modules
web/client/node_modules
.idea
.github
.vscode
*.docker
k8s
config
tests
build-*.sh
shippable.yml
CHANGELOG.md
debugcluster.sh
README.md
LICENSE
.gitignore
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

### Changed

## [4.0.0] - 2021-10-09
### Added
- New web interface based on Vue

### Changed
- Removed old AngularJS interface
- Update packages

## [3.6.0] - 2021-09-16
### Added
- Support for containerd log formats
Expand Down
30 changes: 16 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,26 @@
FROM node:14-alpine AS base
WORKDIR /tilloo
COPY package.json package-lock.json /tilloo/
COPY app/public/package.json app/public/package-lock.json /tilloo/app/public/
COPY web/client/package.json web/client/package-lock.json /tilloo/web/client/

#
# ---- Build ----
FROM base AS build
# Base with tools
FROM base as tools
# install required bits for npm
RUN apk update && apk upgrade && \
apk add --no-cache bash git openssh
# install node packages
RUN cd /tilloo && npm ci && cd app/public && npm ci
apk add --no-cache bash git openssh

#
# ---- Dependencies ----
FROM base AS dependencies
# install required bits for npm
RUN apk update && apk upgrade && \
apk add --no-cache bash git openssh
FROM tools AS dependencies
# install node packages
RUN cd /tilloo && npm ci --only=production && cd app/public && npm ci --only=production
RUN cd /tilloo && npm ci --only=production && cd /tilloo/web/client && npm ci --only=production

#
# ---- Build ----
FROM tools AS build
# build vue app
COPY web/client /tilloo/web/client
RUN cd /tilloo/web/client && npm ci && npm run build

#
# ---- Release ----
Expand All @@ -30,9 +31,10 @@ FROM base AS release
LABEL org.opencontainers.image.source = "https://github.com/chriskinsman/tilloo"
# copy production node_modules
COPY --from=dependencies /tilloo/node_modules ./node_modules
COPY --from=dependencies /tilloo/app/public/node_modules ./app/public/node_modules
COPY --from=build /tilloo/web/client/dist ./web/client/dist
# copy app sources
COPY app /tilloo/app
COPY bin /tilloo/bin
COPY models /tilloo/models
COPY lib /tilloo/lib
COPY web/server /tilloo/web/server

57 changes: 0 additions & 57 deletions app/app.js

This file was deleted.

1 change: 0 additions & 1 deletion app/public/.eslintignore

This file was deleted.

34 changes: 0 additions & 34 deletions app/public/.eslintrc.json

This file was deleted.

57 changes: 0 additions & 57 deletions app/public/app.js

This file was deleted.

Loading

0 comments on commit c8b362c

Please sign in to comment.