Skip to content

Commit

Permalink
Merge branch 'dev/0.15.0' into x-dev-15
Browse files Browse the repository at this point in the history
  • Loading branch information
Josh Moore committed Oct 27, 2023
2 parents 3c50946 + da8494c commit f2f44be
Show file tree
Hide file tree
Showing 6 changed files with 5,203 additions and 233 deletions.
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# production
.ass-data/

# development
node_modules/
4 changes: 2 additions & 2 deletions .github/workflows/ts-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:

# Install npm 10 & TypeScript
- name: Install global packages
run: npm i -g npm@10 typescript
run: npm i -g npm@10 typescript pnpm

# Install ass dependencies (including types)
- name: Install dependencies
run: npm i --save-dev
run: pnpm i

# Compile the TypeScript files
- name: Run build script
Expand Down
10 changes: 6 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# ass Dockerfile v0.3.2
# ass Dockerfile v0.3.3
# authors:
# - tycrek <[email protected]> (https://tycrek.com/)
# - Zusier <[email protected]> (https://github.com/Zusier)

FROM node:20.8.0
FROM node:20.9.0-alpine
WORKDIR /opt/ass-src/
COPY . ./
RUN npm i --save-dev && npm run build
CMD npm start
RUN npm i -g pnpm
RUN pnpm i
RUN npm run build
CMD npm start
Loading

0 comments on commit f2f44be

Please sign in to comment.