Skip to content

Commit

Permalink
Merge branch 'main' into dee/style
Browse files Browse the repository at this point in the history
  • Loading branch information
yanglbme authored Jan 9, 2025
2 parents ed22528 + de2cc52 commit 7b29c3e
Show file tree
Hide file tree
Showing 24 changed files with 581 additions and 56 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Build and Push Docker Images

on:
push:
branches:
- main
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
if: github.repository == 'doocs/md'
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Log in to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build base image
run: bash scripts/build-base-image.sh

- name: Build nginx image
run: bash scripts/build-nginx.sh

- name: Build standalone image
run: bash scripts/build-standalone.sh

- name: Build static image
run: bash scripts/build-static.sh

- name: Push images to Docker Hub
run: bash scripts/push-images.sh
1 change: 0 additions & 1 deletion .github/workflows/preview-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ jobs:
build-preview:
runs-on: ubuntu-latest
if: github.repository == 'doocs/md'

steps:
- uses: actions/checkout@v4
with:
Expand Down
4 changes: 4 additions & 0 deletions docker/latest/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
VER_APP=latest
VER_NGX=1.21.6-alpine
VER_GOLANG=1.17.6-alpine3.15
VER_ALPINE=3.15
14 changes: 14 additions & 0 deletions docker/latest/Dockerfile.base
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM node:20-alpine3.19 AS builder
ENV LANG="en_US.UTF-8"
ENV LANGUAGE="en_US.UTF-8"
ENV LC_ALL="en_US.UTF-8"
RUN apk add curl
RUN curl -L "https://github.com/doocs/md/archive/refs/heads/main.zip" -o "main.zip" && unzip "main.zip" && mv "md-main" /app
WORKDIR /app
COPY ./patch/vite.config.ts /app/vite.config.ts
ENV NODE_OPTIONS="--openssl-legacy-provider"
RUN npm i && npm run build

FROM scratch
LABEL MAINTAINER="ylb<[email protected]>"
COPY --from=builder /app/dist /app/assets
6 changes: 6 additions & 0 deletions docker/latest/Dockerfile.nginx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ARG VER_NGX="1.21.6-alpine"

FROM "doocs/md:latest-assets" AS assets
FROM "nginx:$VER_NGX"
LABEL MAINTAINER="ylb<[email protected]>"
COPY --from=assets /app/* /usr/share/nginx/html
19 changes: 19 additions & 0 deletions docker/latest/Dockerfile.standalone
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
ARG VER_GOLANG=1.17.6-alpine3.15
ARG VER_ALPINE=3.15

FROM "doocs/md:latest-assets" AS assets

FROM "golang:$VER_GOLANG" AS gobuilder
COPY --from=assets /app/* /app/assets/
COPY server/main.go /app
RUN apk add git bash gcc musl-dev upx
WORKDIR /app
RUN go build -ldflags "-w -s" -o md main.go && \
apk add upx && \
upx -9 -o md.minify md

FROM "alpine:$VER_ALPINE"
LABEL MAINTAINER="ylb<[email protected]>"
COPY --from=gobuilder /app/md.minify /bin/md
EXPOSE 80
CMD ["md"]
12 changes: 12 additions & 0 deletions docker/latest/Dockerfile.static
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM doocs/md:latest-assets AS assets

# detail https://github.com/lipanski/docker-static-website/blob/master/Dockerfile
FROM lipanski/docker-static-website

WORKDIR /home/static

COPY --from=assets /app/* /home/static

EXPOSE 80

CMD ["/busybox-httpd", "-f", "-v", "-p", "80", "-c", "httpd.conf"]
66 changes: 66 additions & 0 deletions docker/latest/patch/vite.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import path from 'node:path'
import process from 'node:process'

import vue from '@vitejs/plugin-vue'
import { visualizer } from 'rollup-plugin-visualizer'
import UnoCSS from 'unocss/vite'
import AutoImport from 'unplugin-auto-import/vite'
import Components from 'unplugin-vue-components/vite'
import { defineConfig } from 'vite'
import { nodePolyfills } from 'vite-plugin-node-polyfills'
import vueDevTools from 'vite-plugin-vue-devtools'

// https://vitejs.dev/config/
export default defineConfig({
base: `/`, // 基本路径, 建议以绝对路径跟随访问目录
define: {
process,
},
plugins: [
vue(),
UnoCSS(),
vueDevTools(),
nodePolyfills({
include: [`path`, `util`, `timers`, `stream`, `fs`],
overrides: {
// Since `fs` is not supported in browsers, we can use the `memfs` package to polyfill it.
// fs: 'memfs',
},
}),
process.env.ANALYZE === `true` && visualizer({
emitFile: true,
filename: `stats.html`,
}),
AutoImport({
imports: [
`vue`,
`pinia`,
`@vueuse/core`,
],
dirs: [
`./src/stores`,
`./src/utils/toast`,
],
}),
Components({
resolvers: [],
}),
],
resolve: {
alias: {
'@': path.resolve(__dirname, `./src`),
},
},
css: {
devSourcemap: true,
},
build: {
rollupOptions: {
output: {
chunkFileNames: `static/js/md-[name]-[hash].js`,
entryFileNames: `static/js/md-[name]-[hash].js`,
assetFileNames: `static/[ext]/md-[name]-[hash].[ext]`,
},
},
},
})
21 changes: 21 additions & 0 deletions docker/latest/server/main.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package main

import (
"embed"
"io/fs"
"log"
"net/http"
)

//go:embed assets
var assets embed.FS

func main() {
mutex := http.NewServeMux()
md, _ := fs.Sub(assets, "assets")
mutex.Handle("/", http.FileServer(http.FS(md)))
err := http.ListenAndServe(":80", mutex)
if err != nil {
log.Fatal(err)
}
}
2 changes: 1 addition & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export default antfu({
unocss: true,
typescript: true,
formatters: true,
ignores: [`.github`, `bin`, `md-cli`, `src/assets`, `example`],
ignores: [`.github`, `scripts`, `docker`, `md-cli`, `src/assets`, `example`],
}, {
rules: {
'semi': [`error`, `never`],
Expand Down
61 changes: 60 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"build:cli": "npm run build && npx shx rm -rf md-cli/dist && npx shx rm -rf dist/**/*.map && npx shx cp -r dist md-cli/ && cd md-cli && npm pack",
"build:analyze": "cross-env ANALYZE=true vite build",
"preview": "npm run build && vite preview",
"release:cli": "node ./bin/release.js",
"release:cli": "node ./scripts/release.js",
"ext:dev": "wxt",
"ext:zip": "wxt zip",
"lint": "eslint . --fix",
Expand All @@ -34,6 +34,7 @@
"csstype": "^3.1.3",
"es-toolkit": "^1.27.0",
"form-data": "4.0.1",
"front-matter": "^4.0.2",
"highlight.js": "^11.10.0",
"juice": "^11.0.0",
"lucide-vue-next": "^0.462.0",
Expand All @@ -44,6 +45,7 @@
"pinia": "^2.2.7",
"qiniu-js": "^3.4.2",
"radix-vue": "^1.9.10",
"reading-time": "^1.5.0",
"tailwind-merge": "^2.5.5",
"tailwindcss-animate": "^1.0.7",
"tiny-oss": "^0.5.1",
Expand Down
25 changes: 25 additions & 0 deletions scripts/build-base-image.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

RELEASE_DIR='./docker';
REPO_NAME='doocs/md'

for app_ver in $RELEASE_DIR/*; do

if [ -f "$app_ver/Dockerfile.base" ]; then

tag=$(echo $app_ver | cut -b 10-);
echo "Build: $tag";
set -a
. "$app_ver/.env"
set +a

echo $app_ver
echo "VER_APP: $VER_APP"
echo "VER_NGX: $VER_NGX"
echo "VER_GOLANG: $VER_GOLANG"
echo "VER_ALPINE: $VER_ALPINE"

docker build --build-arg VER_APP=$VER_APP -f "$app_ver/Dockerfile.base" -t "$REPO_NAME:${VER_APP}-assets" "$app_ver"
fi

done
25 changes: 25 additions & 0 deletions scripts/build-nginx.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

RELEASE_DIR='./docker';
REPO_NAME='doocs/md'

for app_ver in $RELEASE_DIR/*; do

if [ -f "$app_ver/Dockerfile.nginx" ]; then

tag=$(echo $app_ver | cut -b 10-);
echo "Build: $tag";
set -a
. "$app_ver/.env"
set +a

echo $app_ver
echo "VER_APP: $VER_APP"
echo "VER_NGX: $VER_NGX"
echo "VER_GOLANG: $VER_GOLANG"
echo "VER_ALPINE: $VER_ALPINE"

docker build --build-arg VER_APP=$VER_APP --build-arg VER_NGX=$VER_NGX -f "$app_ver/Dockerfile.nginx" -t "$REPO_NAME:${VER_APP}-nginx" "$app_ver"
fi

done
Loading

0 comments on commit 7b29c3e

Please sign in to comment.