This commit is contained in:
Trevor Vallender 2023-12-28 12:54:44 +00:00
parent 6f32112b2a
commit e1e3ef94be
6 changed files with 46 additions and 35 deletions

28
.dockerignore Normal file
View File

@ -0,0 +1,28 @@
# Ignore git directory.
/.git/
# Ignore bundler config.
/.bundle
# Ignore all environment files (except templates).
/.env*
!/.env*.erb
# Ignore all default key files.
/config/master.key
/config/credentials/*.key
# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep
# Ignore pidfiles, but keep the directory.
/tmp/pids/*
!/tmp/pids/.keep
# Ignore storage (uploaded files in development and any SQLite databases).
/storage/*
!/storage/.keep
/tmp/storage/*
!/tmp/storage/.keep
# Ignore assets.
/node_modules/
/app/assets/builds/*
!/app/assets/builds/.keep
/public/assets

View File

@ -22,7 +22,6 @@ group :development, :test do
end end
group :development do group :development do
gem "kamal"
gem "web-console" gem "web-console"
end end

View File

@ -76,9 +76,8 @@ GEM
tzinfo (~> 2.0) tzinfo (~> 2.0)
addressable (2.8.5) addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0) public_suffix (>= 2.0.2, < 6.0)
base64 (0.1.1) base64 (0.2.0)
bcrypt (3.1.19) bcrypt (3.1.19)
bcrypt_pbkdf (1.1.0)
bigdecimal (3.1.4) bigdecimal (3.1.4)
bindex (0.8.1) bindex (0.8.1)
bootsnap (1.16.0) bootsnap (1.16.0)
@ -100,10 +99,8 @@ GEM
debug (1.8.0) debug (1.8.0)
irb (>= 1.5.0) irb (>= 1.5.0)
reline (>= 0.3.1) reline (>= 0.3.1)
dotenv (2.8.1) drb (2.2.0)
drb (2.1.1)
ruby2_keywords ruby2_keywords
ed25519 (1.3.0)
erubi (1.12.0) erubi (1.12.0)
globalid (1.2.1) globalid (1.2.1)
activesupport (>= 6.1) activesupport (>= 6.1)
@ -119,16 +116,6 @@ GEM
jbuilder (2.11.5) jbuilder (2.11.5)
actionview (>= 5.0.0) actionview (>= 5.0.0)
activesupport (>= 5.0.0) activesupport (>= 5.0.0)
kamal (1.0.0)
activesupport (>= 7.0)
bcrypt_pbkdf (~> 1.0)
concurrent-ruby (~> 1.2)
dotenv (~> 2.8)
ed25519 (~> 1.2)
net-ssh (~> 7.0)
sshkit (~> 1.21)
thor (~> 1.2)
zeitwerk (~> 2.5)
kaminari (1.2.2) kaminari (1.2.2)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.2) kaminari-actionview (= 1.2.2)
@ -154,7 +141,7 @@ GEM
mini_mime (1.1.5) mini_mime (1.1.5)
minitest (5.20.0) minitest (5.20.0)
msgpack (1.7.2) msgpack (1.7.2)
mutex_m (0.1.2) mutex_m (0.2.0)
net-imap (0.4.1) net-imap (0.4.1)
date date
net-protocol net-protocol
@ -162,11 +149,8 @@ GEM
net-protocol net-protocol
net-protocol (0.2.1) net-protocol (0.2.1)
timeout timeout
net-scp (4.0.0)
net-ssh (>= 2.6.5, < 8.0.0)
net-smtp (0.4.0) net-smtp (0.4.0)
net-protocol net-protocol
net-ssh (7.2.0)
nio4r (2.5.9) nio4r (2.5.9)
nokogiri (1.15.4-aarch64-linux) nokogiri (1.15.4-aarch64-linux)
racc (~> 1.4) racc (~> 1.4)
@ -238,13 +222,10 @@ GEM
actionpack (>= 5.2) actionpack (>= 5.2)
activesupport (>= 5.2) activesupport (>= 5.2)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sshkit (1.21.5)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
stimulus-rails (1.3.0) stimulus-rails (1.3.0)
railties (>= 6.0.0) railties (>= 6.0.0)
stringio (3.0.8) stringio (3.0.8)
thor (1.2.2) thor (1.3.0)
timeout (0.4.0) timeout (0.4.0)
turbo-rails (1.5.0) turbo-rails (1.5.0)
actionpack (>= 6.0.0) actionpack (>= 6.0.0)
@ -277,7 +258,6 @@ DEPENDENCIES
debug debug
importmap-rails importmap-rails
jbuilder jbuilder
kamal
kaminari kaminari
pg pg
puma puma

View File

@ -4,7 +4,7 @@
<p>Welcome to my site! Im a software engineer specialising in Ruby and Rails, with a love for *nix systems, <p>Welcome to my site! Im a software engineer specialising in Ruby and Rails, with a love for *nix systems,
NixOS and free software in general. Im also a maker and dad, and here is where my thoughts get dumped.</p> NixOS and free software in general. Im also a maker and dad, and here is where my thoughts get dumped.</p>
<p>The code for my personal projects <%= link_to "can be found here", "https://git.tsvallender.co.uk/web" %></p> <p>The code for my personal projects <%= link_to "can be found here", "https://git.tsvallender.co.uk/tsv" %></p>
</section> </section>
<aside> <aside>

View File

@ -1 +1 @@
lAYjAMyj72J5LU+gQCHjaDBVeL4rGCpP9JU2lzRCEonWIJ0c2bdo+Gn8RkMdJBScwrc8tBU72gv63mLn8mbFrezDmVvsAXLgpYbo6Pp5y+8VHkD+VZqgKZhzAr27i625X9Xmgsc7ik5A/B9Tk9jsyR5lXLNqZC99eKwG86nE2uUlAIN1vGJDTqIwVowQm1JRLANywaFZ+sxvBFzmwGlcPcOTpCobtIVa7ai3zMuXEWuDF+VChIGhzB1RJTW+hSm8oUaGwsE8T5lhHw8m2OJqn342L8OOsDVLN1o3Us/F/2fDo2v1pRNNLRbfSvVPZwKTVjtxjLuP0c+8B6e4M9qanB8ke681wS7ksJWrRPT4ny0DJH1GVb3Pd8rCWIkKMSiYhz2A4yVCOXA9ctfXkWH8RLteSa2I--KBW8eCVEbtvoEhdb--/feRW0xcGPEchSxObA/6WQ== 4XorrRA3t4mw/Go58/KcTHKiSAj3do7myrEPAeCnH0Lt422WJRnVV6in5Kj0qI0I0RHe5CVgHQhYcKa+VAP3YVn1AqAo9Z2TjNtbeIWyhkcG97DHN5AvUqn2d0ohi49U1ECxVxAgKyuuSIQbg53TMF/23ECbQFoafe/eWBmOBAKou8krXc3ahp1hZa/MlcPfkfR2c6Lm+B8Vvolx+WQ5OoLfJAiFng4MOSyAIg+qv6zr4Ln+Twxt6ADwFoDt7d+jul+vSoQM8OCAhVlOhQWjvB3Rp48ZFrmem0t5ZfGwEMkIRWuQ7w+LxNqW4SUMMqtl3Y1xkPD5f9uZ9O+64agQ/mDX5W5ydaiCyLO19hqEkgR+z7HJ190CJIWyKVPaWp/nxnJaW0ObrZCS5rHOoTdyEGn2SpcO--05NH4ldqywV7Fh2g--/9Hg3mLaVOr/+Yg8PMVIFw==

View File

@ -7,9 +7,15 @@ traefik:
args: args:
entryPoints.web.address: ':80' entryPoints.web.address: ':80'
entryPoints.web.forwardedHeaders.trustedIPs: 0.0.0.0/0 entryPoints.web.forwardedHeaders.trustedIPs: 0.0.0.0/0
options:
network: kamal
servers: servers:
- tsvallender.co.uk web:
hosts:
- tsvallender.co.uk
options:
network: kamal
registry: registry:
username: tsvallender username: tsvallender
@ -19,7 +25,7 @@ registry:
env: env:
clear: clear:
APPLICATION_HOST: tsvallender.co.uk APPLICATION_HOST: tsvallender.co.uk
DB_HOST: 172.17.0.3 DB_HOST: soc-postgres
RAILS_LOG_TO_STDOUT: true RAILS_LOG_TO_STDOUT: true
RAILS_SERVE_STATIC_FILES: true RAILS_SERVE_STATIC_FILES: true
secret: secret:
@ -33,6 +39,9 @@ builder:
args: args:
APPLICATION_HOST: tsvallender.co.uk APPLICATION_HOST: tsvallender.co.uk
RUBY_VERSION: 3.2.2 RUBY_VERSION: 3.2.2
remote:
arch: arm64
host: ssh://kamal@tsvallender.co.uk
accessories: accessories:
postgres: postgres:
@ -46,9 +55,4 @@ accessories:
volumes: volumes:
- /srv/soc/data:/var/lib/postgresql/data - /srv/soc/data:/var/lib/postgresql/data
options: options:
ip: 172.17.0.3 network: kamal
builder:
remote:
arch: arm64
host: ssh://kamal@tsvallender.co.uk