Skip to content

Commit 4e3b91a

Browse files
committed
Suppression de node et npm
Les icônes feather sont maintenant gérés dans `vendor/assets/images`
1 parent a91983d commit 4e3b91a

File tree

294 files changed

+293
-4120
lines changed

Some content is hidden

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

294 files changed

+293
-4120
lines changed

INSTALL.md

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,6 @@ Debian Stretch development machine.
55

66
Note that all commands which require root access are prefixed by `sudo`.
77

8-
# Use stretch-backports
9-
10-
LinuxFr.org requires to add `stretch-backports` source package as it
11-
needs the `npm`package.
12-
13-
```
14-
~ $ sudo bash -c "echo 'deb http://deb.debian.org/debian stretch-backports main' >> /etc/apt/sources.list.d/linuxfr.list"
15-
~ $ sudo apt update
16-
```
17-
188
# Install Debian packages
199

2010
Packages to install from main Stretch source:
@@ -31,12 +21,6 @@ Note:
3121
* you can use libcurl4-gnutls-dev instead of libcurl4-openssl-dev.
3222
* the `mysql` packages will install MariaDB on Debian Stretch
3323

34-
Packages to install from backports:
35-
36-
```
37-
~ $ sudo apt install -t stretch-backports nodejs npm
38-
```
39-
4024
# Get LinuxFr.org code and external resources
4125

4226
Use git to get LinuxFr.org sources:
@@ -70,12 +54,6 @@ Now, we can reach external Ruby resources:
7054

7155
The `check` command above should say you there's no problem.
7256

73-
LinuxFr.org uses also some nodejs resources:
74-
75-
```
76-
~/linuxfr.org $ npm install
77-
```
78-
7957
## Install the LinuxFr.org board
8058

8159
The `board-linuxfr` gem server is used to allow users chat on the `/boards` and

bin/setup

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ FileUtils.chdir APP_ROOT do
1717
system! "gem install bundler --conservative"
1818
system("bundle check") || system!("bundle install")
1919

20-
puts "\n== Installing npm modules =="
21-
system! "npm install"
22-
2320
puts "\n== Copying sample files =="
2421
FileUtils.cp "config/database.yml.sample", "config/database.yml" unless File.exist?("config/database.yml")
2522
FileUtils.cp "config/secrets.yml.sample", "config/secrets.yml" unless File.exist?("config/secrets.yml")

bin/update

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,13 @@ chdir APP_ROOT do
1313
# This script is a way to update your development environment automatically.
1414
# Add necessary update steps to this file.
1515

16-
puts '== Installing dependencies =='
17-
system! 'gem install bundler --conservative'
18-
system('bundle check') || system!('bundle install')
19-
20-
puts "\n== Installing npm modules =="
21-
system! 'npm install'
16+
puts "== Installing dependencies =="
17+
system! "gem install bundler --conservative"
18+
system("bundle check") || system!("bundle install")
2219

2320
puts "\n== Updating database =="
24-
system! 'bin/rails db:migrate'
21+
system! "bin/rails db:migrate"
2522

2623
puts "\n== Removing old logs and tempfiles =="
27-
system! 'bin/rails log:clear tmp:clear'
24+
system! "bin/rails log:clear tmp:clear"
2825
end

config/deploy.rb

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,6 @@
8888
after "deploy:finalize_update", "fs:symlink"
8989
after "deploy:setup", "fs:create_dirs"
9090

91-
92-
# Install npm modules before compiling assets
93-
namespace :npm do
94-
desc "[internal] Install npm modules"
95-
task :install, roles: :app, except: { no_release: true } do
96-
run "cd #{release_path} && npm install --production"
97-
end
98-
end
99-
before "deploy:assets:precompile", "npm:install"
100-
101-
10291
# Redis cache
10392
namespace :cache do
10493
desc "Flush the redis cache"
@@ -120,7 +109,7 @@
120109
run "if [ -e #{unicorn_pidfile} ] ; then kill -QUIT `cat #{unicorn_pidfile}` ; fi"
121110
end
122111

123-
task :restart, roles: :app, except: { no_release: true } do
112+
task :restart, roles: :app, except: { no_release: true } do
124113
set :unicorn_pid, capture("cat #{shared_path}/pids/unicorn.pid").chomp
125114
run "kill -USR2 #{unicorn_pid}"
126115
sleep 1

deployment/linuxfr.org/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,12 @@ RUN echo 'deb http://archive.debian.org/debian stretch main' > '/etc/apt/sources
1818
zlib1g-dev libssl-dev libxml2-dev libxslt-dev autoconf libgmp-dev libyaml-dev \
1919
ncurses-dev bison automake libtool imagemagick libc6-dev hunspell \
2020
hunspell-fr-comprehensive ruby ruby-dev ruby-rack \
21-
&& apt-get install -t stretch-backports -y --no-install-recommends \
22-
nodejs npm \
2321
&& gem install bundler -v 1.17.3 \
2422
&& apt-get clean
2523

2624
RUN mkdir /home/linuxfr.org
2725
ENV HOME /home/linuxfr.org
2826

29-
# Install node external dependencies
30-
COPY package*.json ./
31-
RUN npm ci
32-
3327
# Install external dependencies
3428
COPY Gemfile* ./
3529

0 commit comments

Comments
 (0)