mirrors/dozzle
1
0
Fork 0
mirror of https://github.com/amir20/dozzle.git synced 2025-12-21 13:23:07 +01:00
Code Issues Projects Releases Wiki Activity

Fixes and rebases

Browse Source
This commit is contained in:
Amir Raminfar
2021-10-29 09:33:59 -07:00
parent 6b3f5822a5
commit 17a0e3a62d
6 changed files with 8158 additions and 7991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Dockerfile
View File

@@ -1,27 +1,29 @@
# Build assets # Build assets
FROM node:16-alpine as node FROM node:16-alpine as node
RUN apk add --no-cache git openssh make g++ util-linux RUN apk add --no-cache git openssh make g++ util-linux curl && curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm
WORKDIR /build WORKDIR /build
# Install dependencies # Install dependencies from lock file
COPY package*.json yarn.lock ./ COPY pnpm-lock.yaml ./
RUN yarn install --ignore-scripts --network-timeout 1000000 RUN pnpm fetch
# Copy config files # Copy files
COPY .* webpack*.js ./ COPY package.json .* webpack*.js ./
# Copy assets to build # Copy assets to build
COPY assets ./assets COPY assets ./assets
# Install dependencies
RUN pnpm install -r --offline
# Do the build # Do the build
RUN yarn build RUN pnpm build
FROM golang:1.17.2-alpine AS builder FROM golang:1.17.2-alpine AS builder
RUN apk add --no-cache git ca-certificates RUN apk add --no-cache git ca-certificates && mkdir /dozzle
RUN mkdir /dozzle
WORKDIR /dozzle WORKDIR /dozzle

8
Makefile
View File

@@ -5,13 +5,13 @@ clean:
.PHONY: static .PHONY: static
static: static:
@yarn build @pnpm build
.PHONY: fake_static .PHONY: fake_static
fake_static: fake_static:
@echo 'Skipping yarn build' @echo 'Skipping asset build'
@mkdir -p static @mkdir -p static
@echo "yarn build was skipped" > static/index.html @echo "assets build was skipped" > static/index.html
.PHONY: test .PHONY: test
test: fake_static test: fake_static
@@ -27,7 +27,7 @@ docker:
.PHONY: dev .PHONY: dev
dev: dev:
yarn dev pnpm dev
.PHONY: int .PHONY: int
int: int:

4
README.md
View File

@@ -172,5 +172,5 @@ To Build and test locally:
1. Install NodeJs. 1. Install NodeJs.
2. Install Go. 2. Install Go.
3. Install [reflex](https://github.com/cespare/reflex) with `get -u github.com/cespare/reflex` outside of dozzle. 3. Install [reflex](https://github.com/cespare/reflex) with `get -u github.com/cespare/reflex` outside of dozzle.
4. Install node modules with `yarn`. 4. Install node modules with `pnpm`.
5. Do `yarn dev` 5. Do `pnpm dev`

6
package.json
View File

@@ -6,11 +6,9 @@
"watch": "npm-run-all -p watch:*", "watch": "npm-run-all -p watch:*",
"watch:assets": "webpack --mode=development --watch", "watch:assets": "webpack --mode=development --watch",
"watch:server": "LIVE_FS=true reflex -c .reflex", "watch:server": "LIVE_FS=true reflex -c .reflex",
"predev": "make fake_static", "dev": "make fake_static && npm-run-all -p dev-server watch:server",
"dev": "npm-run-all -p dev-server watch:server",
"dev-server": "webpack serve --mode=development", "dev-server": "webpack serve --mode=development",
"prebuild": "yarn clean", "build": "rm -rf static && webpack --mode=production --progress",
"build": "yarn webpack --mode=production",
"clean": "rm -rf static", "clean": "rm -rf static",
"release": "release-it", "release": "release-it",
"test": "TZ=UTC jest", "test": "TZ=UTC jest",

8139
pnpm-lock.yaml generated Normal file
View File

File diff suppressed because it is too large Load Diff

7972
yarn.lock
View File

File diff suppressed because it is too large Load Diff