fix: docker expose env error (#22)

.github/workflows/build-dev.yml

@@ -3,7 +3,7 @@ name: Build Dev Image
 on:
   push:
     branches:
-      - 'release/1.9.1'
+      - 'dev'
 
 jobs:
   docker:
@@ -23,6 +23,6 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           push: true
-          tags: eolinker/eoapi-remote-server:1.9.1
+          tags: eolinker/eoapi-remote-server:dev
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

Dockerfile

@@ -6,7 +6,8 @@ FROM node:lts-alpine as builder
 
 ENV PROJECT_DIR=/eoapi-remote-server \
     MYSQL_HOST=mysql \
-    MYSQL_PORT=3306
+    MYSQL_PORT=3306 \
+    EOAPI_SERVER_PORT=3000
 
 # WORKDIR指令用于设置Dockerfile中的RUN、CMD和ENTRYPOINT指令执行命令的工作目录(默认为/目录)，该指令在Dockerfile文件中可以出现多次，
 # 如果使用相对路径则为相对于WORKDIR上一次的值，
@@ -40,7 +41,7 @@ RUN chmod +x ./wait-for-it.sh \
 # RUN yarn cache clean
 
 # 容器对外暴露的端口号
-EXPOSE 3000
+EXPOSE $EOAPI_SERVER_PORT
 
 # 容器启动时执行的命令，类似npm run start
 # CMD ["yarn", "start:prod"]

docker-compose.yaml

@@ -4,7 +4,7 @@ services:
   eoapi-remote-server:
     # build: 从当前路径构建镜像
     # build: .
-    image: eolinker/eoapi-remote-server:latest
+    image: eolinker/eoapi-remote-server:dev
     container_name: eoapi-remote-server
     deploy:
       restart_policy:
@@ -15,7 +15,7 @@ services:
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     ports:
-      - '${EOAPI_SERVER_PORT}:3000'
+      - '${EOAPI_SERVER_PORT}:${EOAPI_SERVER_PORT}'
     networks:
       - eoapi_net
 
@@ -45,6 +45,8 @@ services:
         max_attempts: 3
     extra_hosts:
       - 'host.docker.internal:host-gateway'
+    env_file:
+      - .env
     ports:
       - '${EOAPI_WEB_SERVER_POST}:80'
     # volumes:
@@ -59,6 +61,8 @@ services:
       restart_policy:
         condition: on-failure
         max_attempts: 3
+    env_file:
+      - .env
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     ports: