Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
duniter4j
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
clients
java
duniter4j
Commits
4c67414f
Commit
4c67414f
authored
6 years ago
by
Benoit Lavenier
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
8fe41bb4
999f4fc7
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+55
-0
55 additions, 0 deletions
Dockerfile
duniter4j-es-core/src/main/java/org/duniter/elasticsearch/PluginSettings.java
+1
-1
1 addition, 1 deletion
...c/main/java/org/duniter/elasticsearch/PluginSettings.java
with
56 additions
and
1 deletion
Dockerfile
0 → 100644
+
55
−
0
View file @
4c67414f
# Image for Cesium releases on Linux.
#
#
# Building this image:
# docker build . --network=host -t duniter/duniter4j-es
#
# Test:
# docker run --net=host -t duniter/duniter4j-es
# Test (interactive mode + bash mode):
# docker run -i --net=host -t duniter/duniter4j-es bash
#
# Pull base image.
FROM
airdock/oracle-jdk:1.8
ARG
DUNITER4J_VERSION=1.0.2
ARG
LIBSODIUM_VERSION=1.0.13
# Installing dependencies
RUN
apt-get update
&&
\
apt-get
--force-yes
--yes
install
wget unzip build-essential
# Installing libsodium
RUN
wget https://download.libsodium.org/libsodium/releases/libsodium-
${
LIBSODIUM_VERSION
}
.tar.gz
&&
\
tar
-xzf
libsodium-
*
.tar.gz
&&
rm
*
.tar.gz
&&
mv
libsodium-
*
libsodium
&&
\
cd
libsodium
&&
\
./configure
&&
\
make
&&
make check
&&
\
make
install
# Create compiling user
RUN
mkdir
/duniter4j
&&
\
adduser
--system
--group
--quiet
--shell
/bin/bash
--home
/duniter4j duniter4j
&&
\
chown
duniter4j:duniter4j /duniter4j
WORKDIR
/duniter4j
#RUN cd /duniter4j && \
# wget https://git.duniter.org/clients/cesium-grp/cesium/repository/v${CESIUM_VERSION}/archive.tar.gz
# tar -xzf archive.tar.gz && rm *.tar.gz && mv cesium-* src && \
RUN
cd
/duniter4j
&&
\
wget https://github.com/duniter/duniter4j/releases/download/duniter4j-
${
DUNITER4J_VERSION
}
/duniter4j-es-
${
DUNITER4J_VERSION
}
-standalone
.zip
&&
\
unzip
*
.zip
&&
rm
*
.zip
&&
mv
duniter4j-es-
*
duniter4j-es
&&
\
mkdir
duniter4j-es/data
&&
\
chown
-R
duniter4j:duniter4j duniter4j-es
RUN
ln
-s
/duniter4j/duniter4j-es/bin/elasticsearch /usr/bin/duniter4j-es
VOLUME
/duniter4j/duniter4j-es
EXPOSE
9200 9400
USER
duniter4j
WORKDIR
/duniter4j
ENTRYPOINT
["/usr/bin/duniter4j-es"]
CMD
[]
This diff is collapsed.
Click to expand it.
duniter4j-es-core/src/main/java/org/duniter/elasticsearch/PluginSettings.java
+
1
−
1
View file @
4c67414f
...
...
@@ -314,7 +314,7 @@ public class PluginSettings extends AbstractLifecycleComponent<PluginSettings> {
}
public
String
getWebSocketHost
()
{
return
settings
.
get
(
"network.host"
,
"locahost"
);
return
settings
.
get
(
"network.host"
,
"loca
l
host"
);
}
public
String
getWebSocketPort
()
{
...
...
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