docker部署整理

Dockerfile

@@ -4,6 +4,8 @@ ADD ./ /home/pdl/gitlink
 
 WORKDIR /home/pdl/gitlink
 
+RUN /bin/bash -l -c "source /etc/profile.d/rvm.sh"
+
 RUN /bin/bash -l -c 'gem sources --add https://gems.ruby-china.com/ --remove https://rubygems.org/'
 
 RUN /bin/bash -l -c 'gem update --system'

docker-compose.yml

@@ -48,7 +48,7 @@ services:
   web:
     image: gitlink-ubuntu20.04:latest
     build:
-      context: ../
+      context: ./
       dockerfile: Dockerfile
     environment:
       - MYSQL_USER=root
@@ -57,7 +57,7 @@ services:
       - GITEA_USER=root
       - GITEA_PWD=gitlink#2023
       - GITEA_URL=gitea
-    command: bash -c "cmd /home/pdl/forgeplus && rm -f tmp/pids/server.pid && rails s -p 4000 -b '0.0.0.0'"
+    command: bash -c "cmd /home/pdl/gitlink && rm -f tmp/pids/server.pid && rails s -p 4000 -b '0.0.0.0'"
     stdin_open: true
     tty: true
 #    volumes:
@@ -67,3 +67,5 @@ services:
     depends_on:
       - mysql
       - gitea
+    networks:
+      - gitlink