Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Mastodon
Commits
03f5ffcd
Commit
03f5ffcd
authored
8 years ago
by
Eugen Rochko
Browse files
Options
Downloads
Patches
Plain Diff
Dockerfile adjustments
parent
49520d6e
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.dockerignore
+1
-0
1 addition, 0 deletions
.dockerignore
Dockerfile
+4
-2
4 additions, 2 deletions
Dockerfile
app/assets/javascripts/cable.js
+0
-1
0 additions, 1 deletion
app/assets/javascripts/cable.js
with
5 additions
and
3 deletions
.dockerignore
+
1
−
0
View file @
03f5ffcd
...
...
@@ -2,3 +2,4 @@
.env.*
public/system
public/assets
node_modules
This diff is collapsed.
Click to expand it.
Dockerfile
+
4
−
2
View file @
03f5ffcd
...
...
@@ -2,15 +2,17 @@ FROM ruby:2.2.4
ENV
RAILS_ENV=production
RUN
apt-get update
-qq
&&
apt-get
install
-y
build-essential libpq-dev
&&
rm
-rf
/var/lib/apt/lists/
*
RUN
apt-get update
-qq
&&
apt-get
install
-y
build-essential libpq-dev
libxml2-dev libxslt1-dev nodejs nodejs-legacy npm
&&
rm
-rf
/var/lib/apt/lists/
*
RUN
mkdir
/mastodon
WORKDIR
/mastodon
ADD
Gemfile /mastodon/Gemfile
ADD
Gemfile.lock /mastodon/Gemfile.lock
ADD
package.json /mastodon/package.json
RUN
bundle
install
--deployment
--without
test
--without
development
RUN
bundle
install
--deployment
--without
test
development
RUN
npm
install
ADD
. /mastodon
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/cable.js
+
0
−
1
View file @
03f5ffcd
...
...
@@ -3,7 +3,6 @@
//
//= require action_cable
//= require_self
//= require_tree ./channels
(
function
()
{
this
.
App
||
(
this
.
App
=
{});
...
...
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