diff options
| -rw-r--r-- | .devcontainer/Dockerfile | 6 | ||||
| -rw-r--r-- | .future-snap/broken-snapcraft.yaml | 2 | ||||
| -rw-r--r-- | .future-snap/snapcraft.yaml | 2 | ||||
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Dockerfile.arm64v8 | 14 | ||||
| -rw-r--r-- | rebuild-wekan.bat | 4 | ||||
| -rwxr-xr-x | rebuild-wekan.sh | 4 | ||||
| -rwxr-xr-x | releases/release-sandstorm.sh | 2 | ||||
| -rw-r--r-- | snapcraft.yaml | 2 | ||||
| -rwxr-xr-x | stacksmith/user-scripts/build.sh | 2 |
11 files changed, 22 insertions, 22 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index fa17ff1f..2feacc44 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:disco +FROM ubuntu:rolling LABEL maintainer="sgr" ENV BUILD_DEPS="gnupg gosu bsdtar wget curl bzip2 g++ build-essential python git ca-certificates iproute2" @@ -6,8 +6,8 @@ ENV DEBIAN_FRONTEND=noninteractive ENV \ DEBUG=false \ - NODE_VERSION=8.17.0 \ - METEOR_RELEASE=1.8.1 \ + NODE_VERSION=12.16.3 \ + METEOR_RELEASE=1.10.2 \ USE_EDGE=false \ METEOR_EDGE=1.5-beta.17 \ NPM_VERSION=latest \ diff --git a/.future-snap/broken-snapcraft.yaml b/.future-snap/broken-snapcraft.yaml index 6b9cb077..de1b3dbc 100644 --- a/.future-snap/broken-snapcraft.yaml +++ b/.future-snap/broken-snapcraft.yaml @@ -81,7 +81,7 @@ parts: wekan: source: . plugin: nodejs - node-engine: 12.16.2 + node-engine: 12.16.3 node-packages: - node-gyp - node-pre-gyp diff --git a/.future-snap/snapcraft.yaml b/.future-snap/snapcraft.yaml index a84c5d1f..1917834c 100644 --- a/.future-snap/snapcraft.yaml +++ b/.future-snap/snapcraft.yaml @@ -83,7 +83,7 @@ parts: wekan: source: . plugin: nodejs - node-engine: 12.14.1 + node-engine: 12.14.3 node-packages: - node-gyp - node-pre-gyp diff --git a/.travis.yml b/.travis.yml index 2081aad0..b83b5665 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ -dist: eoan +dist: focal sudo: required env: TRAVIS_DOCKER_COMPOSE_VERSION: 1.24.0 - TRAVIS_NODE_VERSION: 12.16.2 + TRAVIS_NODE_VERSION: 12.16.3 TRAVIS_NPM_VERSION: latest before_install: @@ -8,7 +8,7 @@ ARG DEBIAN_FRONTEND=noninteractive ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \ DEBUG=false \ - NODE_VERSION=v12.16.2 \ + NODE_VERSION=v12.16.3 \ METEOR_RELEASE=1.10.2 \ USE_EDGE=false \ METEOR_EDGE=1.5-beta.17 \ diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8 index 35440ddc..bff3c71d 100644 --- a/Dockerfile.arm64v8 +++ b/Dockerfile.arm64v8 @@ -4,11 +4,11 @@ FROM amd64/alpine:3.7 AS builder ENV QEMU_VERSION=v4.2.0-6 \ QEMU_ARCHITECTURE=aarch64 \ NODE_ARCHITECTURE=linux-arm64 \ - NODE_VERSION=v12.16.1 \ + NODE_VERSION=v12.16.3 \ WEKAN_VERSION=3.96 \ WEKAN_ARCHITECTURE=arm64 - - # Install dependencies + + # Install dependencies RUN apk update && apk add ca-certificates outils-sha1 && \ \ # Download qemu static for our architecture @@ -18,7 +18,7 @@ RUN apk update && apk add ca-certificates outils-sha1 && \ wget https://releases.wekan.team/raspi3/wekan-${WEKAN_VERSION}-${WEKAN_ARCHITECTURE}.zip && \ wget https://releases.wekan.team/raspi3/SHA256SUMS.txt && \ # Verify wekan - grep wekan-${WEKAN_VERSION}-${WEKAN_ARCHITECTURE}.zip SHA256SUMS.txt | sha256sum -c - && \ + grep wekan-${WEKAN_VERSION}-${WEKAN_ARCHITECTURE}.zip SHA256SUMS.txt | sha256sum -c - && \ \ # Unzip wekan unzip wekan-${WEKAN_VERSION}-${WEKAN_ARCHITECTURE}.zip && \ @@ -33,7 +33,7 @@ RUN apk update && apk add ca-certificates outils-sha1 && \ # Extract node and remove tar.gz tar xvzf node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz -# Build wekan dockerfile +# Build wekan dockerfile FROM arm64v8/ubuntu:19.10 LABEL maintainer="wekan" @@ -46,7 +46,7 @@ ENV QEMU_ARCHITECTURE=aarch64 \ WITH_API=true \ PORT=8080 \ ROOT_URL=http://localhost \ - MONGO_URL=mongodb://127.0.0.1:27017/wekan + MONGO_URL=mongodb://127.0.0.1:27017/wekan # Copy qemu-static to image COPY --from=builder qemu-${QEMU_ARCHITECTURE}-static /usr/bin @@ -55,7 +55,7 @@ COPY --from=builder qemu-${QEMU_ARCHITECTURE}-static /usr/bin COPY --from=builder bundle /home/wekan/bundle # Copy -COPY --from=builder node-${NODE_VERSION}-${NODE_ARCHITECTURE} /opt/nodejs +COPY --from=builder node-${NODE_VERSION}-${NODE_ARCHITECTURE} /opt/nodejs RUN \ set -o xtrace && \ diff --git a/rebuild-wekan.bat b/rebuild-wekan.bat index 1c38293f..49d0fd58 100644 --- a/rebuild-wekan.bat +++ b/rebuild-wekan.bat @@ -18,8 +18,8 @@ REM Install chocolatey choco install -y git curl python2 dotnet4.5.2 nano mongodb-3 mongoclient meteor
-curl -O https://nodejs.org/dist/v12.16.2/node-v12.16.2-x64.msi
-call node-v12.16.2-x64.msi
+curl -O https://nodejs.org/dist/v12.16.3/node-v12.16.2-x64.msi
+call node-v12.16.3-x64.msi
call npm config -g set msvs_version 2015
call meteor npm config -g set msvs_version 2015
diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index 5b921574..1655d8f7 100755 --- a/rebuild-wekan.sh +++ b/rebuild-wekan.sh @@ -5,7 +5,7 @@ echo " with 'sudo dpkg-reconfigure locales' , so that MongoDB works correct echo " You can still use any other locale as your main locale." #Below script installs newest node 8.x for Debian/Ubuntu/Mint. -#NODE_VERSION=12.16.2 +#NODE_VERSION=12.16.3 #X64NODE="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" function pause(){ @@ -79,7 +79,7 @@ do curl -0 -L https://npmjs.org/install.sh | sudo sh sudo chown -R $(id -u):$(id -g) $HOME/.npm sudo npm -g install n - sudo n 12.16.2 + sudo n 12.16.3 #curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - #sudo apt-get install -y nodejs elif [[ "$OSTYPE" == "darwin"* ]]; then diff --git a/releases/release-sandstorm.sh b/releases/release-sandstorm.sh index 9bf32bf5..22e9bef6 100755 --- a/releases/release-sandstorm.sh +++ b/releases/release-sandstorm.sh @@ -18,7 +18,7 @@ cd $REPODIR rm -rf $WEKANDIR git clone git@github.com:wekan/wekan.git cd $WEKANDIR -sudo n 12.16.2 +sudo n 12.16.3 sudo mkdir -p /usr/local/lib/node_modules/fibers/.node-gyp # Build Wekan ./releases/rebuild-release.sh diff --git a/snapcraft.yaml b/snapcraft.yaml index 689d150c..378a2202 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -81,7 +81,7 @@ parts: wekan: source: . plugin: nodejs - node-engine: 12.16.2 + node-engine: 12.16.3 node-packages: - node-gyp - node-pre-gyp diff --git a/stacksmith/user-scripts/build.sh b/stacksmith/user-scripts/build.sh index 16befc43..17bef18e 100755 --- a/stacksmith/user-scripts/build.sh +++ b/stacksmith/user-scripts/build.sh @@ -2,7 +2,7 @@ set -euxo pipefail BUILD_DEPS="bsdtar gnupg wget curl bzip2 python git ca-certificates perl-Digest-SHA" -NODE_VERSION=v12.16.2 +NODE_VERSION=v12.16.3 #METEOR_RELEASE=1.6.0.1 - for Stacksmith, meteor-1.8 branch that could have METEOR@1.8.1-beta.8 or newer USE_EDGE=false METEOR_EDGE=1.5-beta.17 |