Browse Source

fix: fix docker build profile

luqianyu 11 months ago
parent
commit
5219e052a9
3 changed files with 11 additions and 9 deletions
  1. 2 2
      .drone.yml
  2. 8 6
      Dockerfile
  3. 1 1
      docker-compose.yml

+ 2 - 2
.drone.yml

@@ -5,7 +5,7 @@ clone:
 
 pipeline:
   build:
-    image:  docker.finogeeks.club/base/finchat-desktop-publish:1.0.1
+    image:  docker.finogeeks.club/base/finchat-desktop-publish:1.1.0
     pull: true
     secrets:
       - NPM_TOKEN
@@ -17,7 +17,7 @@ pipeline:
       branch: 
         - master
   build-plugins:
-    image:  docker.finogeeks.club/base/finchat-desktop-publish:1.0.1
+    image:  docker.finogeeks.club/base/finchat-desktop-publish:1.1.0
     commands:
       - cd scripts
       - sh publish-plugin-auth.sh

+ 8 - 6
Dockerfile

@@ -1,10 +1,12 @@
-FROM docker.finogeeks.club/base/node-base:10
+FROM docker.finogeeks.club/base/node-nginx:latest
 MAINTAINER luqianyu@finogeeks.com
 WORKDIR /web
 COPY ./ /web
-RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/g;s/security.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list \
-&& npm install -g pm2 \
-&& apt-get update \
-&& apt-get install -y zip \
-&& npm install -g yarn 
+# RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/g;s/security.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list \
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
+&& npm install -g pm2 --registry=https://registry.npm.taobao.org \
+&& apk add zip \
+&& apk add curl \
+&& apk add git \
+&& npm install -g yarn --registry=https://registry.npm.taobao.org
 CMD pm2 start pm2.json && pm2 log

+ 1 - 1
docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   test:
-    image: aluba
+    image: docker.finogeeks.club/finochat/finchat-desktop-publish:1.1.4-plugins
     build: .
     container_name: test
     # volumes: