From b45fb35ea1cc9aeb3b06e9316fa277b1a0d60a95 Mon Sep 17 00:00:00 2001 From: xxqfamous Date: Mon, 29 May 2023 16:50:24 +0800 Subject: [PATCH] =?UTF-8?q?docker=E9=83=A8=E7=BD=B2=E6=95=B4=E7=90=86-gite?= =?UTF-8?q?a=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/start.sh | 4 +++- docker-compose.yml | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bin/start.sh b/bin/start.sh index 306a4273..3682a068 100644 --- a/bin/start.sh +++ b/bin/start.sh @@ -1,6 +1,8 @@ #!/bin/bash bash -l -c "source /etc/profile.d/rvm.sh" +export PATH=/usr/local/rvm/gems/ruby-2.4.5/bin:/usr/local/rvm/gems/ruby-2.4.5@global/bin:/usr/local/rvm/rubies/ruby-2.4.5/bin:$PATH bash -c "RAILS_ENV=production rails db:create" bash -c "RAILS_ENV=production bundle exec rake sync_table_structure:import_csv" bash -c "RAILS_ENV=production rails db:migrate" -bash -c "rm -f tmp/pids/server.pid && rails s -p 4000 -b '0.0.0.0'" \ No newline at end of file +#bash -c "rm -f tmp/pids/server.pid && RAILS_ENV=production rails s -p 4000 -b '0.0.0.0'" +bash -c "RAILS_ENV=production puma -C config/puma.rb" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 5944a4df..e110013b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: command: --sql-mode="" restart: always volumes: - - ./mysql:/var/lib/mysql + - ./data/mysql:/var/lib/mysql ports: - "13306:3306" environment: @@ -34,7 +34,7 @@ services: - 'bash' - '/start.sh' environment: - - GITEA_WORK_DIR = /var/lib/gitea + - GITEA_WORK_DIR=/var/lib/gitea - GITEA__database__DB_TYPE=mysql - GITEA__database__HOST=mysql:3306 - GITEA__database__NAME=gitea @@ -51,6 +51,8 @@ services: context: ./ dockerfile: Dockerfile environment: + - GEM_PATH=/usr/local/rvm/gems/ruby-2.4.5:/usr/local/rvm/gems/ruby-2.4.5@global + - GEM_HOME=/usr/local/rvm/gems/ruby-2.4.5 - MYSQL_USER=root - MYSQL_PWD=gitea - MYSQL_HOST=mysql