lib/generators/dockerfile_generator.rb in dockerfile-rails-1.7.0 vs lib/generators/dockerfile_generator.rb in dockerfile-rails-1.7.1
- old
+ new
@@ -71,10 +71,11 @@
"libmagickwand-dev" => "imagemagick-libs",
"libsqlite3-0" => "sqlite-dev",
"libtiff-dev" => "tiff-dev",
"libjemalloc2" => "jemalloc",
"libvips" => "vips-dev",
+ "libyaml-dev" => "yaml-dev",
"node-gyp" => "gyp",
"pkg-config" => "pkgconfig",
"python" => "python3",
"python-is-python3" => "python3",
"sqlite3" => "sqlite",
@@ -735,13 +736,13 @@
requirements.join(" and ")
end
def build_packages
# start with the essentials
- packages = %w(build-essential)
+ packages = %w(build-essential libyaml-dev)
packages += @@packages["build"] if @@packages["build"]
packages += %w(nodejs npm) if (node_version == "lts") && (not using_execjs?)
- packages << "libyaml-dev" if options.fullstaq?
+ packages << "libffi-dev" if @@packages["ffi"]
# add databases: sqlite3, postgres, mysql
packages << "pkg-config" if options.sqlite3? || @sqlite3
packages << "libpq-dev" if options.postgresql? || @postgresql
packages << "freetds-dev" if options.sqlserver? || @sqlserver