Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.1.6
FROM --platform=linux/arm64 ruby:3.1.6

RUN apt-get update && \
apt-get install -y build-essential libpq-dev default-mysql-client nodejs && \
Expand All @@ -9,7 +9,7 @@ WORKDIR /app

# Gemfileをコピーしてbundle install
COPY Gemfile Gemfile.lock* ./
RUN bundle config set --local jobs 4 && \
RUN bundle config set --local jobs 2 && \
bundle config set --local retry 3 && \
bundle config set --local without '' && \
bundle install
Expand Down
8 changes: 8 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ GEM
factory_bot_rails (6.5.0)
factory_bot (~> 6.5)
railties (>= 6.1.0)
ffi (1.17.2-aarch64-linux-gnu)
ffi (1.17.2-x86_64-linux-gnu)
globalid (1.2.1)
activesupport (>= 6.1)
Expand All @@ -138,6 +139,9 @@ GEM
i18n (>= 0.7)
multi_json
request_store (>= 1.0)
google-protobuf (4.31.1-aarch64-linux-gnu)
bigdecimal
rake (>= 13)
google-protobuf (4.31.1-x86_64-linux-gnu)
bigdecimal
rake (>= 13)
Expand Down Expand Up @@ -166,6 +170,7 @@ GEM
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
language_server-protocol (3.17.0.5)
libv8-node (24.1.0.0-aarch64-linux)
libv8-node (24.1.0.0-x86_64-linux)
lint_roller (1.1.0)
listen (3.9.0)
Expand Down Expand Up @@ -199,6 +204,8 @@ GEM
net-smtp (0.5.1)
net-protocol
nio4r (2.7.4)
nokogiri (1.18.8-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.8-x86_64-linux-gnu)
racc (~> 1.4)
parallel (1.27.0)
Expand Down Expand Up @@ -406,6 +413,7 @@ GEM
zeitwerk (2.6.18)

PLATFORMS
aarch64-linux
x86_64-linux-gnu

DEPENDENCIES
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
class AddEndTimeAndDurationToJobs < ActiveRecord::Migration[7.1]
def change
add_column :jobs, :end_time, :datetime
add_column :jobs, :duration, :float
end
end
4 changes: 3 additions & 1 deletion db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema[7.1].define(version: 2023_07_25_014426) do
ActiveRecord::Schema[7.1].define(version: 2025_07_03_070828) do
create_table "jobs", charset: "utf8mb4", force: :cascade do |t|
t.datetime "start_time", precision: nil, null: false
t.string "command_and_option"
t.string "base_fqdn"
t.datetime "end_time"
t.float "duration"
end

create_table "labels", charset: "utf8mb4", force: :cascade do |t|
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.with_mysql.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
version: '3'
services:
db:
platform: linux/x86_64
image: mysql:5.7.39
platform: linux/arm64
image: mysql:8.0
container_name: bm-mysql
volumes:
- mysql_data:/var/lib/mysql
environment:
- TZ=${TZ}
- MYSQL_ROOT_PASSWORD=password
command: mysqld --innodb_use_native_aio=0
command: mysqld --innodb_use_native_aio=0 --default-authentication-plugin=mysql_native_password
app:
platform: linux/amd64
platform: linux/arm64
environment:
- TZ=${TZ}
- BUCKY_DB_USERNAME=${BUCKY_DB_USERNAME:-root}
Expand Down
2 changes: 1 addition & 1 deletion docker/nginx/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ http {
index index.html index.htm;

upstream app {
server unix:///app/tmp/sockets/puma.sock;
server app:3000;
}

server {
Expand Down