From eb38b3fda4d07fa5f6d6614aa7e6d0f40b3e78e6 Mon Sep 17 00:00:00 2001
From: xxqfamous <xxq250@qq.com>
Date: Wed, 24 May 2023 18:28:12 +0800
Subject: [PATCH] =?UTF-8?q?docker=E9=83=A8=E7=BD=B2=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile         | 2 ++
 docker-compose.yml | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 881a1e281..a1f37a0cb 100644
--- a/Dockerfile
+++ b/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'
diff --git a/docker-compose.yml b/docker-compose.yml
index 1a6d6858d..22c7b5cbc 100644
--- a/docker-compose.yml
+++ b/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