diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index abdd518c5209033e47dbbbb34e598b0c2ddb961e..0000000000000000000000000000000000000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM debian:jessie - -RUN apt update -RUN apt -y install curl git build-essential python -RUN useradd --create-home -ms /bin/bash duser - -USER duser -WORKDIR /home/duser - -RUN curl -kL https://raw.githubusercontent.com/duniter/duniter/master/install.sh | bash - -EXPOSE 10901 - -ADD go /home/duser/go - -CMD ["bash", "-i", "/home/duser/go"] diff --git a/docker/README.md b/docker/README.md deleted file mode 100644 index e9f53fb19127550a9214aa2a50b4e7445021a9f8..0000000000000000000000000000000000000000 --- a/docker/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# Duniter in a Docker container - -Download `Dockerfile` and `go` files in a repository. - -#### Build a container - -```sh -docker build -t="duniter" . -``` - -#### Execute the container - -Without your indentity - -```sh -docker run -p 10901:10901 \ - -e "DUNITER_URL=cgeek.fr" -e "DUNITER_PORT=9330" \ - -dt duniter -```` - -With your indentity - -```sh -docker run -p 10901:10901 \ - -e "DUNITER_URL=cgeek.fr" -e "DUNITER_PORT=9330" \ - -e "DUNITER_SALT=<your_key_salt>" -e "DUNITER_PASSWD=<your_passwd>" \ - -dt duniter -```` diff --git a/docker/go b/docker/go deleted file mode 100644 index 28c150aad6ce210ee6eba704ffc2074d6fe0fc55..0000000000000000000000000000000000000000 --- a/docker/go +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -locale_ip=`awk 'NR==7 {print $1}' /etc/hosts` -remote_ip=`curl -s https://4.ifcfg.me/` -if [ -n $DUNITER_SALT ] && [ -n $DUNITER_PASSWD ]; then - identity_args="--salt $DUNITER_SALT --passwd $DUNITER_PASSWD" -else - identity_args="" -fi - -duniter init --autoconf -duniter config --noupnp --remote4 $remote_ip --ipv4 $locale_ip $identity_args -duniter sync $DUNITER_URL $DUNITER_PORT -duniter start -tail -f /dev/null diff --git a/install.sh b/install.sh deleted file mode 100755 index 1ec01a782bffcd8ee079d69815205fd2e113b16b..0000000000000000000000000000000000000000 --- a/install.sh +++ /dev/null @@ -1,210 +0,0 @@ -#!/bin/bash - -{ # this ensures the entire script is downloaded # - -is_installed() { - type "$1" > /dev/null 2>&1 -} - -if [ -z "$DUNITER_DIR" ]; then - DUNITER_DIR="$HOME/.duniter" -fi - -latest_version() { - echo "v1.3.13" -} - -repo_url() { - echo "https://github.com/duniter/duniter.git" -} - -download() { - if is_installed "curl"; then - curl -qkL $* - elif is_installed "wget"; then - # Emulate curl with wget - ARGS=$(echo "$*" | command sed -e 's/--progress-bar /--progress=bar /' \ - -e 's/-L //' \ - -e 's/-I /--server-response /' \ - -e 's/-s /-q /' \ - -e 's/-o /-O /' \ - -e 's/-C - /-c /') - wget $ARGS - fi -} - -install_from_git() { - - local PREVIOUS_PATH - PREVIOUS_PATH=$PATH - if [ -d "$DUNITER_DIR/.git" ]; then - echo "=> duniter is already installed in $DUNITER_DIR, trying to update using git" - printf "\r=> " - cd "$DUNITER_DIR" && (command git fetch 2> /dev/null || { - echo >&2 "Failed to update duniter, run 'git fetch' in $DUNITER_DIR yourself." && exit 1 - }) - else - # Cloning to $DUNITER_DIR - echo "=> Downloading duniter from git to '$DUNITER_DIR'" - printf "\r=> " - mkdir -p "$DUNITER_DIR" - command git clone "$(repo_url)" "$DUNITER_DIR" - fi - cd "$DUNITER_DIR" && command git checkout --quiet $(latest_version) - if [ ! -z "$(cd "$DUNITER_DIR" && git show-ref refs/heads/master)" ]; then - if git branch --quiet 2>/dev/null; then - cd "$DUNITER_DIR" && command git branch --quiet -D master >/dev/null 2>&1 - else - echo >&2 "Your version of git is out of date. Please update it!" - cd "$DUNITER_DIR" && command git branch -D master >/dev/null 2>&1 - fi - fi - - # Download Nodejs - local NVER="6.11.1"; - local ARCH="x86" - local X64=`uname -a | grep "x86_64"` - local ARM=`uname -a | grep "arm"` - if [ ! -z "$X64" ]; then - ARCH="x64" - fi - # ARM processors - if [ ! -z "$ARM" ]; then - ARCH="`uname -m`" - fi - local NODEJS_FILENAME=node-v${NVER}-linux-${ARCH} - local NODEJS_TARBALL=http://nodejs.org/dist/v${NVER}/${NODEJS_FILENAME}.tar.gz - local NODEJS_ARCHIVE=$DUNITER_DIR/node.tar.gz - local NODEJS_EXTRACTED=$DUNITER_DIR/$NODEJS_FILENAME - if [ ! -d "$DUNITER_DIR/node" ]; then - echo "=> Downloading '$NODEJS_TARBALL' to '$NODEJS_ARCHIVE'" - download "$NODEJS_TARBALL" -o "$NODEJS_ARCHIVE" || { - echo >&2 "Failed to download '$NODEJS_TARBALL'" - return 4 - } - tar xzf $NODEJS_ARCHIVE || { - echo >&2 "Failed to extract '$NODEJS_ARCHIVE'" - return 5 - } - mv $NODEJS_FILENAME "node" || { - echo >&2 "Failed to extract '$NODEJS_ARCHIVE'" - return 6 - } - fi - - # Install Duniter dependencies (NPM modules) - NODE=$DUNITER_DIR/node/bin/node - NPM=$DUNITER_DIR/node/bin/npm - $NODE $NPM install - [[ $? -eq 0 ]] && $NODE -e "const deps = require('./package.json').peerDependencies; Object.keys(deps).forEach(k => console.log(k + \"@\" + deps[k]))" | xargs $NODE $NPM install --save --production - return -} - -# -# Detect profile file if not specified as environment variable -# (eg: PROFILE=~/.myprofile) -# The echo'ed path is guaranteed to be an existing file -# Otherwise, an empty string is returned -# -detect_profile() { - - local DETECTED_PROFILE - DETECTED_PROFILE='' - local SHELLTYPE - SHELLTYPE="$(basename /$SHELL)" - - if [ $SHELLTYPE = "bash" ]; then - if [ -f "$HOME/.bashrc" ]; then - DETECTED_PROFILE="$HOME/.bashrc" - elif [ -f "$HOME/.bash_profile" ]; then - DETECTED_PROFILE="$HOME/.bash_profile" - fi - elif [ $SHELLTYPE = "zsh" ]; then - DETECTED_PROFILE="$HOME/.zshrc" - fi - - if [ -z $DETECTED_PROFILE ]; then - if [ -f "$PROFILE" ]; then - DETECTED_PROFILE="$PROFILE" - elif [ -f "$HOME/.profile" ]; then - DETECTED_PROFILE="$HOME/.profile" - elif [ -f "$HOME/.bashrc" ]; then - DETECTED_PROFILE="$HOME/.bashrc" - elif [ -f "$HOME/.bash_profile" ]; then - DETECTED_PROFILE="$HOME/.bash_profile" - elif [ -f "$HOME/.zshrc" ]; then - DETECTED_PROFILE="$HOME/.zshrc" - fi - fi - - if [ ! -z $DETECTED_PROFILE ]; then - echo "$DETECTED_PROFILE" - fi -} - -do_install() { - - # Check required commands - if ! is_installed "git"; then - echo "=> git is not available. You will likely need to install 'git' package." - exit 1 - fi - if ! is_installed "curl"; then - echo "=> curl is not available. You will likely need to install 'curl' package." - exit 1 - fi - if ! is_installed "make"; then - echo "=> make is not available. You will likely need to install 'build-essential' package." - exit 1 - fi - if ! is_installed "g++"; then - echo "=> g++ is not available. You will likely need to install 'build-essential' package." - exit 1 - fi - if ! is_installed "python"; then - echo "=> python is not available. You will likely need to install 'python' package." - exit 1 - fi - - install_from_git - - echo - - local PROFILE - PROFILE=$(detect_profile) - - SOURCE_STR="\nexport DUNITER_DIR=\"$DUNITER_DIR\"\n[ -s \"\$DUNITER_DIR/duniter.sh\" ] && . \"\$DUNITER_DIR/duniter.sh\" # This loads duniter.sh" - - if [ -z "$PROFILE" ] ; then - echo "=> Profile not found. Tried $PROFILE (as defined in \$PROFILE), ~/.bashrc, ~/.bash_profile, ~/.zshrc, and ~/.profile." - echo "=> Create one of them and run this script again" - echo "=> Create it (touch $PROFILE) and run this script again" - echo " OR" - echo "=> Append the following lines to the correct file yourself:" - printf "$SOURCE_STR" - echo - else - if ! command grep -qc '/duniter.sh' "$PROFILE"; then - echo "=> Appending source string to $PROFILE" - printf "$SOURCE_STR\n" >> "$PROFILE" - else - echo "=> Source string already in $PROFILE" - fi - fi - echo "===> !Run the command 'source" $PROFILE"' to start using duniter! <===" - reset -} - -# -# Unsets the various functions defined -# during the execution of the install script -# -reset() { - unset -f reset is_installed latest_version \ - download install_from_git \ - detect_profile do_install -} - -[ "_$DUNITER_ENV" = "_testing" ] || do_install $1 - -} # this ensures the entire script is downloaded # diff --git a/release/new_version.sh b/release/new_version.sh index 67bddca85de65eea143f267749e5bc67734ef879..fbbda1bdcf6dc7121e9980b3b17b8c53de176f16 100755 --- a/release/new_version.sh +++ b/release/new_version.sh @@ -19,12 +19,9 @@ if [[ $1 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ ]]; then sed -i "s/title\": .*/title\": \"v$1\",/g" package.json sed -i "s/<title>Duniter.*<\/title>/<title>Duniter $1<\/title>/g" gui/index.html - # Bump the install.sh - sed -i "s/echo \"v.*\"/echo \"v$1\"/g" install.sh - # Commit git reset HEAD - git add install.sh package.json test/integration/branches.js gui/index.html release/arch/debian/package/DEBIAN/control install.sh release/arch/windows/duniter.iss + git add package.json test/integration/branches.js gui/index.html release/arch/debian/package/DEBIAN/control release/arch/windows/duniter.iss git commit -m "v$1" git tag "v$1" else