Skip to content

Commit 72ace6c

Browse files
authored
修复 pixiu aio 镜像启动失败问题 (pixiu-io#340)
1 parent d303d03 commit 72ace6c

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ build: install
1616
npm run build
1717

1818
image:
19-
docker build -t ${dockerhubUser}/${releaseName}:${tag} --platform=linux -f docker/Dockerfile .
19+
docker build --no-cache -t ${dockerhubUser}/${releaseName}:${tag} --platform=linux -f docker/Dockerfile .
2020

2121
push: image
2222
docker push ${dockerhubUser}/${releaseName}:${tag}
2323

2424
image-aio:
25-
docker build -t ${dockerhubUser}/pixiu-aio:${tag} --platform=linux -f docker/Dockerfile-aio .
25+
docker build --no-cache -t ${dockerhubUser}/pixiu-aio:${tag} --platform=linux -f docker/Dockerfile-aio .
2626

2727
push-aio: image-aio
2828
docker push ${dockerhubUser}/pixiu-aio:${tag}

docker/Dockerfile-aio

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ RUN npm config set registry https://registry.npmmirror.com/ && npm install && np
1313

1414
FROM nginx:alpine
1515
LABEL MAINTAINER="PIXIU"
16+
1617
COPY --from=builder /build/dist /usr/share/nginx/html/pixiu
1718
COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
1819
COPY --from=pixiu-builder /app/pixiu /app
1920
COPY docker/start.sh /usr/local/bin/pixiu_start
2021

21-
CMD ['pixiu_start']
22+
CMD ["pixiu_start"]

docker/start.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/bin/sh
12
set -o errexit
23
set -o xtrace
34

0 commit comments

Comments
 (0)