Merge pull request #36 from dappnode/v0.2.24

v0.2.24 Release

build/Dockerfile

@@ -20,16 +20,16 @@ RUN ALPINE_GLIBC_BASE_URL="https://github.com/sgerrand/alpine-pkg-glibc/releases
     ALPINE_GLIBC_I18N_PACKAGE_FILENAME="glibc-i18n-$ALPINE_GLIBC_PACKAGE_VERSION.apk" && \
     apk add --no-cache --virtual=.build-dependencies wget ca-certificates && \
     wget \
-        "https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub" \
-        -O "/etc/apk/keys/sgerrand.rsa.pub" && \
+    "https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub" \
+    -O "/etc/apk/keys/sgerrand.rsa.pub" && \
     wget \
-        "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
-        "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
-        "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
+    "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
+    "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
+    "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
     apk add --no-cache \
-        "$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
-        "$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
-        "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
+    "$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
+    "$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
+    "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
     \
     rm "/etc/apk/keys/sgerrand.rsa.pub" && \
     /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true && \
@@ -40,16 +40,18 @@ RUN ALPINE_GLIBC_BASE_URL="https://github.com/sgerrand/alpine-pkg-glibc/releases
     rm "/root/.wget-hsts" && \
     apk del .build-dependencies && \
     rm \
-        "$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
-        "$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
-        "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME"
+    "$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
+    "$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
+    "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME"
 
 RUN wget https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-Linux-x86_64 -O /usr/local/bin/docker-compose \
-  && chmod +x /usr/local/bin/docker-compose
+    && chmod +x /usr/local/bin/docker-compose
 
 ENV COMPOSE_IGNORE_ORPHANS true
 
 COPY entrypoint.sh .
-COPY upgrade_*.sh ./
+COPY upgrades ./upgrades
+COPY scripts ./scripts
+COPY deb ./deb
 
 ENTRYPOINT [ "/usr/src/app/entrypoint.sh" ]

build/entrypoint.sh

@@ -20,12 +20,14 @@ docker-compose -f /usr/src/app/DNCORE/docker-compose-dappmanager.yml up -d
 docker-compose -f /usr/src/app/DNCORE/docker-compose-admin.yml up -d
 docker-compose -f /usr/src/app/DNCORE/docker-compose-wifi.yml up -d
 
-if [ -n "`grep \"restart: always\" /usr/src/app/DNCORE/docker-compose-core.yml`" ]; then
-    sed -i 's/restart: always//g' /usr/src/app/DNCORE/docker-compose-core.yml
-    docker-compose -f /usr/src/app/DNCORE/docker-compose-core.yml up -d
-fi
+# Copy host scripts and packages
+mkdir -p /usr/src/app/DNCORE/scripts/upgrade
+cp -rf ./scripts/* /usr/src/app/DNCORE/scripts/upgrade
+chmod +x /usr/src/app/DNCORE/scripts/upgrade/*.sh
+cp -fr ./deb /usr/src/app/DNCORE/scripts/upgrade/
 
-# Apply all upgrades
-for filename in ./upgrade_*.sh; do
+# Apply all local upgrades
+for filename in ./upgrades/upgrade_*.sh; do
+    echo "Applying upgrade ${filename}..."
     sh "${filename}"
 done

build/scripts/install_usbmount.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+set -euo pipefail
+
+USBMOUNT_PKG="usbmount_0.0.200_all.deb"
+USBMOUNT_PATH="/usr/src/dappnode/DNCORE/scripts/upgrade/deb/$USBMOUNT_PKG"
+TMP_DIR="/tmp/dappnode"
+
+if [ ! -f "/etc/os-release" ]; then
+    echo "Cannot detect OS flavor, exiting."
+    exit 1
+fi
+
+if [[ $EUID -ne 0 ]]; then
+    echo "This script must be run as root."
+    exit 1
+fi
+
+source /etc/os-release
+
+if [ "$ID" == "ubuntu" ] || [ "$ID" == "debian" ]; then
+    DEBIAN_FRONTEND=noninteractive apt update -y
+    DEBIAN_FRONTEND=noninteractive apt install -y "${USBMOUNT_PATH}"
+else
+    echo "Distribution not supported, exiting."
+    exit 1
+fi
+
+echo "-> ${USBMOUNT_PKG} package installed successfully."

build/upgrades/upgrade_003.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Run script on the host with the nsenter tool
+docker run --rm --privileged --pid=host -t alpine:3.8 nsenter -t 1 -m -u -n -i /usr/src/dappnode/DNCORE/scripts/upgrade/install_usbmount.sh

dappnode_package.json

@@ -1,13 +1,14 @@
 {
   "name": "core.dnp.dappnode.eth",
-  "version": "0.2.23",
+  "version": "0.2.24",
   "description": "DAppNode package responsible for manage the core packages",
   "avatar": "/ipfs/QmS4kGwYA8n918xdNUgFt8MCfnsR8pjmzphS59BL7qtLq2",
   "type": "dncore",
   "image": {
-    "path": "",
-    "hash": "",
-    "size": "",
+    "path": "core.dnp.dappnode.eth_0.2.24.tar.xz",
+    "hash": "/ipfs/QmQj43An9HkfYoEDTB5ZzoVqq3f55i6qnx26d8NSppfbWZ",
+    "size": 32877428,
+    "restart": "on-failure",
     "volumes": [
       "/usr/src/dappnode/DNCORE/:/usr/src/app/DNCORE/",
       "/var/run/docker.sock:/var/run/docker.sock"
@@ -40,8 +41,8 @@
     "ethforward.dnp.dappnode.eth": "0.2.3",
     "vpn.dnp.dappnode.eth": "0.2.4",
     "wamp.dnp.dappnode.eth": "0.2.0",
-    "admin.dnp.dappnode.eth": "0.2.11",
-    "dappmanager.dnp.dappnode.eth": "0.2.22",
+    "admin.dnp.dappnode.eth": "0.2.12",
+    "dappmanager.dnp.dappnode.eth": "0.2.23",
     "wifi.dnp.dappnode.eth": "0.2.0"
   },
   "changelog": "",

docker-compose.yml

@@ -8,7 +8,8 @@ networks:
 services:
   core.dnp.dappnode.eth:
     build: ./build
-    image: 'core.dnp.dappnode.eth:0.2.23'
+    restart: 'no'
+    image: 'core.dnp.dappnode.eth:0.2.24'
     container_name: DAppNodeCore-core.dnp.dappnode.eth
     volumes:
       - '/usr/src/dappnode/DNCORE/:/usr/src/app/DNCORE/'

releases.json

@@ -38,5 +38,12 @@
       "dappnode": "Wed, 04 Dec 2019 21:51:39 GMT"
     },
     "link": "http://my.dappnode/#/sdk/publish/r=core.dnp.dappnode.eth&v=0.2.21&h=%2Fipfs%2FQmUauENjpNqzJ97uBdbtGw9QDZysXMXxJo35H7gvH5apNj"
+  },
+  "0.2.24": {
+    "hash": "/ipfs/QmaKc1DwTuQUY1p2s51o1fyRohmKmwc7HSeGYS4MPMemTQ",
+    "type": "manifest",
+    "uploadedTo": {
+      "dappnode": "Thu, 26 Dec 2019 18:45:04 GMT"
+    }
   }
 }