Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
mastofe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Pleroma
mastofe
Commits
b9f59ebc
Commit
b9f59ebc
authored
7 years ago
by
Yamagishi Kazutoshi
Committed by
Eugen Rochko
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Update Yarn to version 1.1.0 (#5125)
* Update Yarn to version 1.1.0 * remove hard-coding
parent
e648ef0b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Dockerfile
+12
-4
12 additions, 4 deletions
Dockerfile
with
12 additions
and
4 deletions
Dockerfile
+
12
−
4
View file @
b9f59ebc
...
@@ -7,6 +7,8 @@ ENV UID=991 GID=991 \
...
@@ -7,6 +7,8 @@ ENV UID=991 GID=991 \
RAILS_SERVE_STATIC_FILES=true \
RAILS_SERVE_STATIC_FILES=true \
RAILS_ENV=production NODE_ENV=production
RAILS_ENV=production NODE_ENV=production
ARG
YARN_VERSION=1.1.0
ARG
YARN_DOWNLOAD_SHA256=171c1f9ee93c488c0d774ac6e9c72649047c3f896277d88d0f805266519430f3
ARG
LIBICONV_VERSION=1.15
ARG
LIBICONV_VERSION=1.15
ARG
LIBICONV_DOWNLOAD_SHA256=ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178
ARG
LIBICONV_DOWNLOAD_SHA256=ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178
...
@@ -19,6 +21,7 @@ RUN apk -U upgrade \
...
@@ -19,6 +21,7 @@ RUN apk -U upgrade \
build-base
\
build-base
\
icu-dev
\
icu-dev
\
libidn-dev
\
libidn-dev
\
libressl
\
libtool
\
libtool
\
postgresql-dev
\
postgresql-dev
\
protobuf-dev
\
protobuf-dev
\
...
@@ -32,16 +35,21 @@ RUN apk -U upgrade \
...
@@ -32,16 +35,21 @@ RUN apk -U upgrade \
imagemagick
\
imagemagick
\
libidn
\
libidn
\
libpq
\
libpq
\
nodejs-npm
\
nodejs
\
nodejs
\
nodejs-npm
\
protobuf
\
protobuf
\
su-exec
\
su-exec
\
tini
\
tini
\
yarn
\
&&
update-ca-certificates
\
&&
update-ca-certificates
\
&&
mkdir
-p
/tmp/src /opt
\
&&
wget
-O
yarn.tar.gz
"https://github.com/yarnpkg/yarn/releases/download/v
$YARN_VERSION
/yarn-v
$YARN_VERSION
.tar.gz"
\
&&
echo
"
$YARN_DOWNLOAD_SHA256
*yarn.tar.gz"
|
sha256sum
-c
-
\
&&
tar
-xzf
yarn.tar.gz
-C
/tmp/src
\
&&
rm
yarn.tar.gz
\
&&
mv
/tmp/src/yarn-v
$YARN_VERSION
/opt/yarn
\
&&
ln
-s
/opt/yarn/bin/yarn /usr/local/bin/yarn
\
&&
wget
-O
libiconv.tar.gz
"http://ftp.gnu.org/pub/gnu/libiconv/libiconv-
$LIBICONV_VERSION
.tar.gz"
\
&&
wget
-O
libiconv.tar.gz
"http://ftp.gnu.org/pub/gnu/libiconv/libiconv-
$LIBICONV_VERSION
.tar.gz"
\
&&
echo
"
$LIBICONV_DOWNLOAD_SHA256
*libiconv.tar.gz"
|
sha256sum
-c
-
\
&&
echo
"
$LIBICONV_DOWNLOAD_SHA256
*libiconv.tar.gz"
|
sha256sum
-c
-
\
&&
mkdir
-p
/tmp/src
\
&&
tar
-xzf
libiconv.tar.gz
-C
/tmp/src
\
&&
tar
-xzf
libiconv.tar.gz
-C
/tmp/src
\
&&
rm
libiconv.tar.gz
\
&&
rm
libiconv.tar.gz
\
&&
cd
/tmp/src/libiconv-
$LIBICONV_VERSION
\
&&
cd
/tmp/src/libiconv-
$LIBICONV_VERSION
\
...
@@ -56,7 +64,7 @@ COPY Gemfile Gemfile.lock package.json yarn.lock /mastodon/
...
@@ -56,7 +64,7 @@ COPY Gemfile Gemfile.lock package.json yarn.lock /mastodon/
RUN
bundle config build.nokogiri
--with-iconv-lib
=
/usr/local/lib
--with-iconv-include
=
/usr/local/include
\
RUN
bundle config build.nokogiri
--with-iconv-lib
=
/usr/local/lib
--with-iconv-include
=
/usr/local/include
\
&&
bundle
install
-j
$(
getconf _NPROCESSORS_ONLN
)
--deployment
--without
test
development
\
&&
bundle
install
-j
$(
getconf _NPROCESSORS_ONLN
)
--deployment
--without
test
development
\
&&
yarn
--ignore-optional
--pure-lockfile
&&
yarn
--pure-lockfile
COPY
. /mastodon
COPY
. /mastodon
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment