Skip to content

Commit 4726d6e

Browse files
committed
v8.1.0
First release in the 8.1 series. This primarily contains backend bug fixes and dependency updates. Major changes included: * Removal of webpack and yarn,npm. Importmaps are now used. * All coffeescript has been removed and scripts rewritten in normal js. * Upgrade to Sidekiq v7, which requires redis v6.2+.
1 parent 2d7bd83 commit 4726d6e

File tree

173 files changed

+1741
-13723
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+1741
-13723
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ Dockerfile
2424
.rubocop.yml
2525
.yardopts
2626
.browserslistrc
27+
tmp/

.github/workflows/rolling-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
services:
1919
postgres:
20-
image: postgres:13-alpine
20+
image: postgres:15-alpine
2121
env:
2222
POSTGRES_USER: cstacks
2323
POSTGRES_DB: cstacks
@@ -32,7 +32,7 @@ jobs:
3232
- 5432:5432
3333
redis:
3434
# Docker Hub image
35-
image: redis
35+
image: redis:7
3636
# Set health checks to wait until redis has started
3737
options: >-
3838
--health-cmd "redis-cli ping"

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,4 @@ lib/dev/bin/
7878
lib/dev/keys/
7979
plugins/
8080
.yarn/
81+
workspace/

.yarnrc.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Change Log
22

3+
## v8.1.0
4+
5+
_Please see doc/upgrades/v81/ for upgrade notes._
6+
7+
* [CHANGE] Replace webpacker with importmaps.
8+
* [CHANGE] Replace passenger with puma.
9+
10+
***
11+
312
## v8.0.4
413

514
* [CHANGE] Update initial images on a fresh install.

Dockerfile

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,45 +31,44 @@ RUN set -ex; \
3131
iputils-ping \
3232
vim \
3333
git \
34-
nodejs \
35-
yarnpkg \
3634
supervisor \
35+
nginx-light \
3736
; \
38-
gem install -N passenger sassc nokogiri \
39-
&& passenger-config compile-agent --auto --optimize \
40-
&& passenger-config install-standalone-runtime --auto --skip-cache \
41-
&& passenger-config build-native-support \
42-
&& passenger-config compile-agent --auto --optimize \
43-
&& passenger-config install-standalone-runtime --auto --skip-cache \
44-
&& passenger-config build-native-support \
37+
echo "set_real_ip_from 127.0.0.1;" > /etc/nginx/conf.d/restore_ip.conf \
38+
; \
39+
curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
40+
; \
41+
apt-get install -y nodejs \
42+
&& corepack enable \
43+
; \
44+
gem install -N puma sassc nokogiri \
4545
; \
4646
mkdir -p /usr/src/app/vendor; \
47-
ln -s /usr/bin/yarnpkg /usr/local/bin/yarn; \
48-
apt-get clean; \
49-
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*;
47+
apt-get clean \
48+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
5049

5150
WORKDIR /usr/src/app
5251

5352
COPY Gemfile /usr/src/app
5453
COPY Gemfile.lock /usr/src/app
55-
COPY package.json /usr/src/app
56-
COPY lib/supervisord.conf /etc/supervisord.conf
5754

5855
RUN bundle config https://rubygems.pkg.github.com/ComputeStacks $github_user:$github_token \
5956
&& bundle config set without 'test development' \
6057
; \
6158
cd /usr/src/app \
6259
&& bundle install \
63-
&& yarn \
6460
; \
6561
bundle config --delete https://rubygems.pkg.github.com/computestacks/
6662

63+
COPY lib/build/nginx.conf /etc/nginx/sites-enabled/default
64+
COPY lib/build/supervisord.conf /etc/supervisord.conf
6765
COPY . /usr/src/app
6866

6967
RUN echo "$(cat VERSION)-$(git rev-parse --short --verify HEAD)" > VERSION \
7068
&& bundle exec rails db:schema:load \
7169
&& bundle exec rake generate_changelog \
72-
&& bundle exec rake assets:precompile
70+
&& bundle exec rake assets:precompile \
71+
&& mkdir -p /usr/src/app/tmp/pids
7372

7473
EXPOSE 3000
7574

Gemfile

Lines changed: 45 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,25 @@ source 'https://rubygems.org'
44

55
git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
66

7-
gem 'timeout', '= 0.3.0'
7+
gem 'timeout', '= 0.3.2'
88

9-
gem 'rails', '= 7.0.4'
9+
gem 'rails', '= 7.0.4.3'
1010
gem 'json', '= 2.6.3'
11-
gem 'redis', '= 4.8.0' # v5 requires sidekiq v7+
12-
gem 'hiredis', '= 0.6.3', platform: :ruby
1311

14-
gem 'rack-attack', '= 6.6.1'
12+
# Redis
13+
gem "hiredis", "< 1"
14+
gem "redis", "< 6"
15+
gem 'redis-client', '< 1' # sidekiq
1516

16-
gem 'tzinfo-data', '= 1.2022.7' # No source of timezone data could be found. (TZInfo::DataSourceNotFound)
17+
gem 'rack-attack', '~> 6.6'
18+
19+
gem 'tzinfo-data' # No source of timezone data could be found. (TZInfo::DataSourceNotFound)
1720

1821
gem 'rake', '= 13.0.6'
1922
gem 'sprockets', '= 4.2.0'
2023
gem 'sprockets-rails', '= 3.4.2'
21-
gem 'webpacker', '= 5.4.3'
22-
gem 'pg', '= 1.4.5', platform: :ruby
23-
gem 'jquery-rails', '= 4.5.1'
24+
gem 'importmap-rails', '~> 1'
25+
gem 'pg', '= 1.5.3', platform: :ruby
2426

2527
gem 'httparty', '= 0.21.0' # @deprecated for httprb
2628
gem 'http', '= 5.1.1'
@@ -32,50 +34,48 @@ gem 'api-pagination', '= 5.0.0'
3234

3335
gem 'money-rails', '= 1.15.0'
3436
gem 'whois', '= 5.1.0'
35-
gem 'coffee-rails', '= 5.0.0'
3637

37-
gem 'sidekiq', '= 6.5.8'
38-
gem 'sidekiq-unique-jobs', '= 7.1.29'
38+
gem 'sidekiq', '< 8'
39+
gem 'sidekiq-unique-jobs', '< 9'
3940

4041
# Logging
4142
gem 'lograge', '= 0.12.0'
4243

4344
# Authentication
44-
gem 'devise', '= 4.8.1'
45+
gem 'devise', '= 4.9.2'
4546
gem 'bcrypt', '= 3.1.18'
4647

47-
gem "doorkeeper", "= 5.6.2"
48+
gem "doorkeeper", "= 5.6.6"
4849

4950
gem 'rotp', '= 6.2.2'
5051
gem 'rqrcode', '= 2.1.2'
51-
gem 'webauthn', '= 2.5.2'
52+
gem 'webauthn', '= 3.0.0'
5253

53-
gem 'clockwork', '= 3.0.1'
54+
gem 'clockwork', '= 3.0.2'
5455
gem 'http_accept_language', '= 2.1.1'
5556

56-
gem 'nokogiri', '= 1.14.2'
57+
gem 'nokogiri', '~> 1'
5758

5859
gem 'country_select', '= 8.0.1'
59-
gem 'responders', '= 3.0.1'
60+
gem 'responders', '= 3.1.0'
6061

6162
gem 'daemons', '= 1.4.1'
6263
gem 'net-smtp'
63-
gem 'slim', '= 4.1.0'
64-
#gem 'valvat', '= 0.6.10'
65-
gem 'uglifier', '= 4.2.0'
64+
gem 'slim', '= 5.1.0'
65+
# gem 'uglifier', '= 4.2.0'
6666

67-
gem 'chartkick', '= 4.2.1'
68-
gem 'groupdate', '= 6.1.0'
67+
gem 'chartkick', '= 5.0.2'
68+
gem 'groupdate', '= 6.2.1'
6969

7070
gem 'ssh_data', '= 1.3.0' # Generate & Validate SSH Keys
71-
gem 'net-ssh', '= 7.0.1'
71+
gem 'net-ssh', '= 7.1.0'
7272
gem 'ed25519', '= 1.3.0'
7373
gem 'bcrypt_pbkdf', '= 1.1.0' # Support ed25519 ssh keys for net-ssh.
7474
gem 'highline', '= 2.1.0' # Hide PW entered into net-ssh from logs and output.
7575

7676
# Markdown Support
7777
gem 'github-markup', '= 4.0.1'
78-
gem 'redcarpet', '= 3.5.1', platform: :ruby
78+
gem 'redcarpet', '= 3.6.0', platform: :ruby
7979

8080

8181
gem "sentry-ruby"
@@ -86,22 +86,22 @@ gem 'sass-rails', '= 6.0.0'
8686
gem 'bootstrap-sass', '= 3.4.1'
8787

8888
gem 'rabl', '= 0.16.1'
89-
gem 'oj', '= 3.13.23', platform: :ruby
90-
gem 'jwt', '= 2.6.0'
89+
gem 'oj', '= 3.14.3', platform: :ruby
90+
gem 'jwt', '= 2.7.0'
9191

9292
# LetsEncrypt
93-
gem 'acme-client', '= 2.0.11'
93+
gem 'acme-client', '= 2.0.13'
9494

9595
gem 'versioncake', '= 4.1.1'
9696

9797
# Console
98-
gem 'pry', '= 0.14.2'
99-
gem 'pry-rails', '= 0.3.9'
98+
gem 'pry'
99+
gem 'pry-rails'
100100

101101
gem 'diplomat', '= 2.6.4'
102102

103-
gem 'fugit', '= 1.5.3'
104-
gem 'zaru', '= 0.3.0'
103+
gem 'fugit', '= 1.8.1'
104+
gem 'zaru', '= 1.0.0'
105105

106106
gem 'acts-as-taggable-on', '= 9.0.1'
107107

@@ -111,27 +111,28 @@ gem 'liquid', '= 5.4.0' # Used to generate variables in custom commands
111111
# Used by CAA check to determine TLD for a domain.
112112
gem 'domain_prefix', '= 0.4.20210906' # https://github.com/postageapp/domain_prefix
113113

114-
gem 'dnsruby', '= 1.61.9' # https://github.com/alexdalitz/dnsruby
114+
gem 'dnsruby', '= 1.70.0' # https://github.com/alexdalitz/dnsruby
115+
116+
gem 'prometheus-api-client', '= 0.6.3'
115117

116-
gem 'prometheus-api-client', '= 0.6.2'
118+
gem 'font-awesome-sass', '~> 6.4'
117119

118-
gem 'font-awesome-sass', '= 6.2.1'
120+
gem 'puma'
119121

120122
group :development do
121-
gem 'passenger', '~> 6.0' # Now managed by container
122-
gem 'yard', '= 0.9.28'
123-
gem 'listen', '= 3.8.0'
123+
gem 'yard'
124+
gem 'listen'
124125
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
125-
gem "better_errors", '= 2.9.1'
126-
gem "binding_of_caller", "= 1.0.0"
127-
gem 'rack-cors', '= 1.1.1'
126+
gem "better_errors"
127+
gem "binding_of_caller"
128+
gem 'rack-cors'
128129
gem 'i18n-tasks'
129130
gem 'solargraph'
130131
end
131132

132133
group :test do
133-
gem 'minitest-reporters', '= 1.5.0'
134-
gem 'capybara', '~> 3.38'
134+
gem 'minitest-reporters'
135+
gem 'capybara'
135136
gem 'selenium-webdriver'
136137
gem 'webmock'
137138
end
@@ -143,16 +144,7 @@ source "https://rubygems.pkg.github.com/computestacks" do
143144
gem "docker_volume_local", "0.2.5"
144145
gem "docker_volume_nfs", "0.2.7"
145146
gem "pdns", "1.1.1"
146-
gem "whmcs", "2.3.6"
147+
gem "whmcs", "2.3.7"
147148
end
148149

149150
gem 'docker-api', github: 'ComputeStacks/docker-api', ref: 'a36e692'
150-
151-
# Assets
152-
# http://insecure.rails-assets.org
153-
# https://rails-assets.org
154-
source 'http://insecure.rails-assets.org' do
155-
gem 'rails-assets-js-cookie', '= 2.1.4'
156-
gem 'rails-assets-jsTimezoneDetect', '= 1.0.6'
157-
end
158-

0 commit comments

Comments
 (0)