Skip to content

Commit 934ef24

Browse files
authored
Merge branch 'ankane:master' into master
2 parents f62d888 + 229d312 commit 934ef24

File tree

5 files changed

+165
-147
lines changed

5 files changed

+165
-147
lines changed

CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
## 3.0.2 (2023-11-28)
2+
3+
- Updated Blazer to 3.0.2
4+
5+
## 3.0.1 (2023-10-08)
6+
7+
- Updated Blazer to 3.0.1
8+
9+
## 3.0.0 (2023-09-20)
10+
11+
- Updated Blazer to 3.0.0
12+
- Added experimental support for `linux/arm64`
13+
114
## 2.6.5 (2022-08-31)
215

316
- Updated Blazer to 2.6.5

Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.0.6-alpine3.16
1+
FROM ruby:3.2.4-alpine3.20
22

33
MAINTAINER Andrew Kane <[email protected]>
44

@@ -13,12 +13,12 @@ WORKDIR $INSTALL_PATH
1313

1414
COPY . .
1515

16-
RUN apk add --update build-base git libpq-dev mariadb-dev sqlite-dev libpq mariadb-connector-c sqlite-libs unixodbc && \
16+
RUN apk add --update build-base gcompat git libpq-dev mariadb-dev libpq mariadb-connector-c unixodbc && \
1717
gem install bundler && \
1818
bundle install && \
1919
bundle binstubs --all && \
2020
bundle exec rake assets:precompile && \
21-
apk del build-base git libpq-dev mariadb-dev sqlite-dev && \
21+
apk del build-base git libpq-dev mariadb-dev && \
2222
rm -rf /var/cache/apk/*
2323

2424
ENV PORT 8080

Gemfile

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
source "https://rubygems.org"
22

3-
gem "rails", "~> 6.1.0"
4-
gem "blazer", "2.6.5"
3+
gem "rails", "~> 7.0.0"
4+
gem "sprockets-rails"
5+
gem "blazer", "3.0.2"
56
gem "puma"
67
gem "tzinfo-data"
78

89
# data sources
9-
gem "activerecord6-redshift-adapter"
10+
# gem "activerecord6-redshift-adapter"
1011
gem "aws-sdk-athena"
1112
gem "aws-sdk-glue"
1213
gem "drill-sergeant"
@@ -25,11 +26,14 @@ gem "pg"
2526
gem "presto-client"
2627
gem "restforce"
2728
# gem "odbc_adapter" # TODO add snowflake driver
28-
gem "sqlite3"
29+
# gem "sqlite3"
2930
# gem "tiny_tds"
3031
# gem "activerecord-sqlserver-adapter"
3132

3233
# anomaly detection and forecasting
3334
gem "anomaly_detection"
3435
gem "prophet-rb"
3536
gem "trend"
37+
38+
# TODO remove when updating Ruby
39+
gem "uri", ">= 0.12.2"

0 commit comments

Comments
 (0)