aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com>2021-05-05 18:36:33 +0530
committerLibravatar GitHub <noreply@github.com>2021-05-05 13:06:33 +0000
commit2cc06bb7d7e817354f88ab3ba73123718bf566cb (patch)
tree3156054385f7bca365474139113687e858af853c
parentMinify images (#480) (diff)
downloadferdium-recipes-2cc06bb7d7e817354f88ab3ba73123718bf566cb.tar.gz
ferdium-recipes-2cc06bb7d7e817354f88ab3ba73123718bf566cb.tar.zst
ferdium-recipes-2cc06bb7d7e817354f88ab3ba73123718bf566cb.zip
Upgraded nodejs to '14.16.1' (#482)
-rw-r--r--.devcontainer/Dockerfile31
-rw-r--r--.devcontainer/devcontainer.json22
-rw-r--r--.travis.yml2
-rw-r--r--package.json2
4 files changed, 28 insertions, 29 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index e1af327..048cebe 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,21 +1,16 @@
1#------------------------------------------------------------------------------------------------------------- 1# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.174.0/containers/javascript-node/.devcontainer/base.Dockerfile
2# Copyright (c) Microsoft Corporation. All rights reserved.
3# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
4#-------------------------------------------------------------------------------------------------------------
5 2
6# To fully customize the contents of this image, use the following Dockerfile instead: 3# [Choice] Node.js version: 14, 12, 10
7# https://github.com/microsoft/vscode-dev-containers/tree/v0.117.1/containers/javascript-node-12/.devcontainer/Dockerfile 4ARG VARIANT="14-buster"
8FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-12 5FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
9 6
10# ** [Optional] Uncomment this section to install additional packages. ** 7# [Optional] Uncomment this section to install additional OS packages.
11# 8# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
12# ENV DEBIAN_FRONTEND=noninteractive 9# && apt-get -y install --no-install-recommends <your-package-list-here>
13# RUN apt-get update \
14# && apt-get -y install --no-install-recommends <your-package-list-here> \
15# #
16# # Clean up
17# && apt-get autoremove -y \
18# && apt-get clean -y \
19# && rm -rf /var/lib/apt/lists/*
20# ENV DEBIAN_FRONTEND=dialog
21 10
11# [Optional] Uncomment if you want to install an additional version of node using nvm
12# ARG EXTRA_NODE_VERSION=10
13# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
14
15# [Optional] Uncomment if you want to install more global node modules
16# RUN su node -c "npm install -g <your-package-list-here>"
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1c169bf..d7bd89b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,12 +1,16 @@
1// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at: 1// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2// https://github.com/microsoft/vscode-dev-containers/tree/v0.117.1/containers/javascript-node-12 2// https://github.com/microsoft/vscode-dev-containers/tree/v0.174.0/containers/javascript-node
3{ 3{
4 "name": "Node.js 12", 4 "name": "Node.js",
5 "dockerFile": "Dockerfile", 5 "build": {
6 "dockerfile": "Dockerfile",
7 // Update 'VARIANT' to pick a Node version: 10, 12, 14
8 "args": { "VARIANT": "14" }
9 },
6 10
7 // Set *default* container specific settings.json values on container create. 11 // Set *default* container specific settings.json values on container create.
8 "settings": { 12 "settings": {
9 "terminal.integrated.shell.linux": "/bin/bash" 13 "terminal.integrated.defaultProfile.linux": "/bin/bash"
10 }, 14 },
11 15
12 // Add the IDs of extensions you want installed when the container is created. 16 // Add the IDs of extensions you want installed when the container is created.
@@ -18,8 +22,8 @@
18 // "forwardPorts": [], 22 // "forwardPorts": [],
19 23
20 // Use 'postCreateCommand' to run commands after the container is created. 24 // Use 'postCreateCommand' to run commands after the container is created.
21 // "postCreateCommand": "npm install" 25 // "postCreateCommand": "npm install",
22 26
23 // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root. 27 // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
24 // "remoteUser": "node" 28 "remoteUser": "node"
25} 29}
diff --git a/.travis.yml b/.travis.yml
index e84769f..48d6db6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
1language: node_js 1language: node_js
2node_js: 2node_js:
3 - 10 3 - 14
4install: 4install:
5 - npm install 5 - npm install
6script: 6script:
diff --git a/package.json b/package.json
index 88ec172..de599c5 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,6 @@
32 "targz": "^1.0.1" 32 "targz": "^1.0.1"
33 }, 33 },
34 "devDependencies": { 34 "devDependencies": {
35 "imagemin-cli": "6.0.0" 35 "imagemin-cli": "^6.0.0"
36 } 36 }
37} 37}