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 Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ gem "acts_as_list", "~>0.4"
gem "bitfields", "~>0.4"
gem "bootsnap", "~>1.3", require: false
gem "canable", "~>0.1"
gem "carrierwave", "~>1.1"
gem "devise", "~>4.3"
gem "carrierwave", "~>1.3"
gem "devise", "~>4.7"
gem "diff_match_patch", github: "nono/diff_match_patch-ruby", require: "diff_match_patch"
gem "doorkeeper", "~>4.2"
gem "ffi-hunspell", github: "postmodern/ffi-hunspell"
Expand Down
24 changes: 13 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ GEM
rake (>= 10.4, < 13.0)
ansi (1.5.0)
arel (9.0.0)
bcrypt (3.1.12)
bcrypt (3.1.13)
better_errors (2.5.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
Expand All @@ -108,10 +108,11 @@ GEM
canable (0.3.0)
capistrano-maintenance (0.0.5)
capistrano (~> 2.0)
carrierwave (1.2.3)
carrierwave (1.3.2)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
ssrf_filter (~> 1.0)
coderay (1.1.2)
coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
Expand All @@ -124,10 +125,10 @@ GEM
crass (1.0.6)
daemons (1.2.6)
debug_inspector (0.0.3)
devise (4.6.2)
devise (4.7.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
dimensions (1.3.0)
Expand Down Expand Up @@ -201,9 +202,9 @@ GEM
mini_mime (>= 0.1.1)
marcel (1.0.1)
method_source (0.9.2)
mime-types (3.2.2)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mime-types-data (3.2021.0225)
mini_magick (4.9.4)
mini_mime (1.0.3)
mini_portile2 (2.4.0)
Expand Down Expand Up @@ -273,9 +274,9 @@ GEM
ffi (~> 1.0)
redcarpet (3.4.0)
redis (4.0.2)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
responders (3.0.0)
actionpack (>= 5.0)
railties (>= 5.0)
rinku (2.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
Expand All @@ -302,6 +303,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
ssrf_filter (1.0.7)
state_machine (1.2.0)
sushi (0.0.4)
temple (0.8.0)
Expand Down Expand Up @@ -346,9 +348,9 @@ DEPENDENCIES
canable (~> 0.1)
capistrano (~> 2.15)!
capistrano-maintenance
carrierwave (~> 1.1)
carrierwave (~> 1.3)
coffee-rails (~> 4.1)
devise (~> 4.3)
devise (~> 4.7)
diff_match_patch!
doorkeeper (~> 4.2)
ffi-hunspell!
Expand Down
1 change: 1 addition & 0 deletions deployment/default.env
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ MYSQL_TEST_DATABASE=linuxfr_test
MYSQL_TEST_USER=linuxfr_test
MYSQL_TEST_PASSWORD=linuxfr_test

RAILS_ENV=development
2 changes: 1 addition & 1 deletion deployment/linuxfr-board/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:stretch-slim
FROM debian:bullseye-slim

LABEL maintainer="[email protected]"
LABEL version="1.0"
Expand Down
2 changes: 1 addition & 1 deletion deployment/linuxfr-img/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:stretch-slim
FROM debian:bullseye-slim

LABEL maintainer="[email protected]"
LABEL version="1.0"
Expand Down
9 changes: 4 additions & 5 deletions deployment/linuxfr.org/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:stretch-slim
FROM debian:bullseye-slim

LABEL maintainer="[email protected]"
LABEL version="1.0"
Expand All @@ -7,15 +7,14 @@ LABEL description="Run LinuxFr.org Ruby on Rails website"
WORKDIR /linuxfr.org

# Install system dependencies
RUN echo 'deb http://deb.debian.org/debian stretch-backports main' >> '/etc/apt/sources.list.d/linuxfr.list' \
&& apt-get update \
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
mysql-client libmysql++-dev git \
default-mysql-client libmysql++-dev git \
build-essential openssl libreadline-dev curl libcurl4-openssl-dev zlib1g \
zlib1g-dev libssl-dev libxml2-dev libxslt-dev autoconf libgmp-dev libyaml-dev \
ncurses-dev bison automake libtool imagemagick libc6-dev hunspell \
hunspell-fr-comprehensive ruby ruby-dev ruby-rack \
&& apt-get install -t stretch-backports -y --no-install-recommends \
&& apt-get install -y --no-install-recommends \
nodejs npm \
&& gem install bundler -v 1.17.3 \
&& apt-get clean
Expand Down
30 changes: 21 additions & 9 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,15 @@ services:
volumes:
# Share host directories so, the developer can edit them
# and see the result without need to restart the container
- ./app:/linuxfr.org/app
- ./db:/linuxfr.org/db
- ./public:/linuxfr.org/public
- type: bind
source: ./app
target: /linuxfr.org/app
- type: bind
source: ./db
target: /linuxfr.org/db
- type: bind
source: ./public
target: /linuxfr.org/public
# uploads are shared with the nginx service
- data-uploads:/linuxfr.org/uploads
tmpfs:
Expand Down Expand Up @@ -45,8 +51,12 @@ services:
env_file:
- deployment/default.env
volumes:
- ./deployment/nginx/templates:/etc/nginx/templates
- ./public/fonts:/var/linuxfr/fonts
- type: bind
source: ./deployment/nginx/templates
target: /etc/nginx/templates
- type: bind
source: ./public/fonts
target: /var/linuxfr/fonts
- data-uploads:/var/linuxfr/uploads
ports:
- "80:80"
Expand All @@ -56,26 +66,28 @@ services:
- linuxfr-img

database:
image: mariadb:10.1
image: mariadb:10.7
env_file:
- deployment/default.env
restart: always
volumes:
- data-database:/var/lib/mysql

database-test:
image: mariadb:10.1
image: mariadb:10.7
env_file:
- deployment/default.env
entrypoint: ["/linuxfr-entrypoint.sh"]
command: ["mysqld"]
restart: always
volumes:
- data-database-test:/var/lib/mysql
- ./deployment/database-test/entrypoint.sh:/linuxfr-entrypoint.sh
- type: bind
source: ./deployment/database-test/entrypoint.sh
target: /linuxfr-entrypoint.sh

redis:
image: redis:5
image: redis:6
restart: always
volumes:
- data-redis:/data
Expand Down
Loading