Skip to content

Use GNU libiconv in Nokogiri#4494

Merged
Gargron merged 1 commit intomastodon:masterfrom
ykzts:libiconv
Aug 3, 2017
Merged

Use GNU libiconv in Nokogiri#4494
Gargron merged 1 commit intomastodon:masterfrom
ykzts:libiconv

Conversation

@ykzts
Copy link
Copy Markdown
Member

@ykzts ykzts commented Aug 2, 2017

System default libiconv of Alpine Linux only supports some charset (e.g. UTF-8). Therefore, the preview card of the page which is not UTF-8 will be broken in the Docker environment.

Solve using GNU libiconv.

before after
before screenshot after screenshot

Dockerfile Outdated
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

libxml2 and libxslt will be downloaded during Nokogiri installation.

@Wonderfall
Copy link
Copy Markdown
Contributor

I also use GNU Libiconv in some of my Docker images for that reason. So +1 for this.
Isn't libtool --finish /usr/local/lib needed? Also it would be better if $LIBICONV_VERSION was set with a build-time variable (ARG) instead of an environment variable.

@ykzts
Copy link
Copy Markdown
Member Author

ykzts commented Aug 2, 2017

@Wonderfall Thank you for review!

@Wonderfall
Copy link
Copy Markdown
Contributor

The libtool package must be added as well. 😉
Also --prefix /usr/local can be added as a parameter to configure.

I tried myself (https://github.com/Wonderfall/dockerfiles/blob/master/mastodon/Dockerfile.targaryen#L60-L65), this change is working.

+1 for merging!

@ykzts
Copy link
Copy Markdown
Member Author

ykzts commented Aug 3, 2017

@Wonderfall Okay! Thx😚

System default libiconv of Alpine Linux only supports some charset (e.g. UTF-8).
Therefore, the preview card of the page which is not UTF-8 will be broken in the Docker environment.

Using GNU libiconv!
@Gargron Gargron merged commit ab60aa2 into mastodon:master Aug 3, 2017
@ykzts ykzts deleted the libiconv branch August 3, 2017 16:05
pfigel added a commit to pfigel/mastodon that referenced this pull request Aug 7, 2017
* tag 'v1.5.1': (25 commits)
  Bump to 1.5.1
  i18n: update Persian translation (mastodon#4540)
  Fix mastodon#4531 (mastodon#4533)
  fr.yml update (mastodon#4531)
  Translate 'Signed in as' into Japanese (mastodon#4530)
  l10n OC - Added  mastodon#4523 "signed in as" (mastodon#4529)
  fix columns_area.js (mastodon#4528)
  Update goldfinger to 2.0.1, see mastodon/goldfinger#5 (mastodon#4527)
  Add "signed in as" header to some pages (mastodon#4523)
  l10n update Occitan (mastodon#4522)
  Scroll columns area to right when children property is changed (mastodon#4517)
  Fix some mistakes in Polish translation (mastodon#4495)
  Ignore some locale keys that can but do not need to be translated (mastodon#4515)
  Dutch strings: typo (mastodon#4489)
  Use GNU libiconv in Nokogiri (mastodon#4494)
  i18n: Update Polish translation (mastodon#4479)
  Enable cache for babel-loader (mastodon#4505)
  Redirect to PasswordController#new when reset_password_token is invalid (mastodon#4506)
  make number of comparison in emojify() fewer (mastodon#4500)
  Don't normalize invalid domain names (mastodon#4499)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants