Skip to content

Commit 0ef2ae0

Browse files
committed
chore: docker add arm64
1 parent 1b78bad commit 0ef2ae0

File tree

4 files changed

+33
-26
lines changed

4 files changed

+33
-26
lines changed

.github/workflows/sharevb-docker-nightly-release.yml

+13-10
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,28 @@ jobs:
5757
- name: Checkout repository
5858
uses: actions/checkout@v3
5959

60-
# Set up Docker Buildx (to support multi-platform builds)
61-
- name: Set up Docker Buildx
62-
uses: docker/setup-buildx-action@v2
63-
64-
# Log in to GitHub Container Registry (GHCR)
65-
- name: Log in to GitHub Container Registry
66-
uses: docker/login-action@v2
60+
- name: Login to GitHub Container Registry
61+
uses: docker/login-action@v3
6762
with:
6863
registry: ghcr.io
6964
username: ${{ github.repository_owner }}
7065
password: ${{ secrets.GITHUB_TOKEN }}
7166

72-
# Build and push the Docker image
73-
- name: Build and push Docker image
67+
- name: Set up QEMU
68+
uses: docker/setup-qemu-action@v3
69+
70+
- name: Set up Docker Buildx
71+
uses: docker/setup-buildx-action@v3
72+
73+
- name: Build and push
7474
uses: docker/build-push-action@v5
7575
with:
7676
context: .
77+
file: ./Dockerfile
78+
platforms: linux/amd64,linux/arm64
7779
push: true
78-
tags: ghcr.io/${{ github.repository_owner }}/it-tools:nightly
80+
tags: |
81+
ghcr.io/${{ github.repository_owner }}/it-tools:nightly
7982
8083
# Optionally log out
8184
- name: Log out from GitHub Container Registry

.github/workflows/sharevb-docker-realease.yml

+14-10
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,29 @@ jobs:
3838
- name: Checkout repository
3939
uses: actions/checkout@v3
4040

41-
# Set up Docker Buildx (to support multi-platform builds)
42-
- name: Set up Docker Buildx
43-
uses: docker/setup-buildx-action@v2
44-
45-
# Log in to GitHub Container Registry (GHCR)
46-
- name: Log in to GitHub Container Registry
47-
uses: docker/login-action@v2
41+
- name: Login to GitHub Container Registry
42+
uses: docker/login-action@v3
4843
with:
4944
registry: ghcr.io
5045
username: ${{ github.repository_owner }}
5146
password: ${{ secrets.GITHUB_TOKEN }}
5247

53-
# Build and push the Docker image
54-
- name: Build and push Docker image
48+
- name: Set up QEMU
49+
uses: docker/setup-qemu-action@v3
50+
51+
- name: Set up Docker Buildx
52+
uses: docker/setup-buildx-action@v3
53+
54+
- name: Build and push
5555
uses: docker/build-push-action@v5
5656
with:
5757
context: .
58+
file: ./Dockerfile
59+
platforms: linux/amd64,linux/arm64
5860
push: true
59-
tags: ghcr.io/${{ github.repository_owner }}/it-tools:latest
61+
tags: |
62+
ghcr.io/${{ github.repository_owner }}/it-tools:latest
63+
6064
6165
# Optionally log out
6266
- name: Log out from GitHub Container Registry

Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ FROM node:lts-alpine AS build-stage
44
ENV NPM_CONFIG_LOGLEVEL warn
55
ENV CI true
66

7+
RUN apk add --update python3 make g++\
8+
&& rm -rf /var/cache/apk/*
9+
710
WORKDIR /app
811
COPY package.json pnpm-lock.yaml ./
912
RUN npm install -g pnpm && pnpm i --frozen-lockfile

components.d.ts

+3-6
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ declare module '@vue/runtime-core' {
129129
GeoDistanceCalculator: typeof import('./src/tools/geo-distance-calculator/geo-distance-calculator.vue')['default']
130130
GitMemo: typeof import('./src/tools/git-memo/git-memo.vue')['default']
131131
'GitMemo.content': typeof import('./src/tools/git-memo/git-memo.content.md')['default']
132+
GptTokenEstimator: typeof import('./src/tools/gpt-token-estimator/gpt-token-estimator.vue')['default']
132133
GzipConverter: typeof import('./src/tools/gzip-converter/gzip-converter.vue')['default']
133134
HashText: typeof import('./src/tools/hash-text/hash-text.vue')['default']
134135
HddCalculator: typeof import('./src/tools/hdd-calculator/hdd-calculator.vue')['default']
@@ -207,6 +208,7 @@ declare module '@vue/runtime-core' {
207208
JsonToYaml: typeof import('./src/tools/json-to-yaml-converter/json-to-yaml.vue')['default']
208209
JsonViewer: typeof import('./src/tools/json-viewer/json-viewer.vue')['default']
209210
JsUnobfuscator: typeof import('./src/tools/js-unobfuscator/js-unobfuscator.vue')['default']
211+
JwtGenerator: typeof import('./src/tools/jwt-generator/jwt-generator.vue')['default']
210212
JwtParser: typeof import('./src/tools/jwt-parser/jwt-parser.vue')['default']
211213
KeycodeInfo: typeof import('./src/tools/keycode-info/keycode-info.vue')['default']
212214
LengthConverter: typeof import('./src/tools/length-converter/length-converter.vue')['default']
@@ -239,26 +241,21 @@ declare module '@vue/runtime-core' {
239241
MongoObjectidConverter: typeof import('./src/tools/mongo-objectid-converter/mongo-objectid-converter.vue')['default']
240242
MorseConverter: typeof import('./src/tools/morse-converter/morse-converter.vue')['default']
241243
MultiLinkDownloader: typeof import('./src/tools/multi-link-downloader/multi-link-downloader.vue')['default']
244+
MyIp: typeof import('./src/tools/my-ip/my-ip.vue')['default']
242245
NanoidGenerator: typeof import('./src/tools/nanoid-generator/nanoid-generator.vue')['default']
243246
NanoMemo: typeof import('./src/tools/nano-memo/nano-memo.vue')['default']
244247
'NanoMemo.content': typeof import('./src/tools/nano-memo/nano-memo.content.md')['default']
245248
NavbarButtons: typeof import('./src/components/NavbarButtons.vue')['default']
246-
NCode: typeof import('naive-ui')['NCode']
247-
NCode: typeof import('naive-ui')['NCode']
248249
NCollapseTransition: typeof import('naive-ui')['NCollapseTransition']
249250
NConfigProvider: typeof import('naive-ui')['NConfigProvider']
250251
NEllipsis: typeof import('naive-ui')['NEllipsis']
251252
NginxFormatter: typeof import('./src/tools/nginx-formatter/nginx-formatter.vue')['default']
252253
NH1: typeof import('naive-ui')['NH1']
253254
NH3: typeof import('naive-ui')['NH3']
254255
NIcon: typeof import('naive-ui')['NIcon']
255-
NInputNumber: typeof import('naive-ui')['NInputNumber']
256-
NInputNumber: typeof import('naive-ui')['NInputNumber']
257256
NLayout: typeof import('naive-ui')['NLayout']
258257
NLayoutSider: typeof import('naive-ui')['NLayoutSider']
259258
NMenu: typeof import('naive-ui')['NMenu']
260-
NScrollbar: typeof import('naive-ui')['NScrollbar']
261-
NScrollbar: typeof import('naive-ui')['NScrollbar']
262259
NumeronymGenerator: typeof import('./src/tools/numeronym-generator/numeronym-generator.vue')['default']
263260
OcrImage: typeof import('./src/tools/ocr-image/ocr-image.vue')['default']
264261
Option43Generator: typeof import('./src/tools/option43-generator/option43-generator.vue')['default']

0 commit comments

Comments
 (0)