updated node version

EpistasisLab · Aug 23, 2022 · 875588a · 875588a
2 parents b2869e5 + 6157f68
commit 875588a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/docker-compose-raspberrypi.yml b/docker-compose-raspberrypi.yml
@@ -1,7 +1,11 @@
 version: '3'
 
 services:
+<<<<<<< HEAD
   lab_rpi:
+=======
+  lab:
+>>>>>>> 6157f68666d57632f83a685ab5521145d6c923fc
     build:
       context: .
       dockerfile: docker/lab/rpi.Dockerfile
@@ -19,7 +23,11 @@ services:
     depends_on:
       - dbmongo
 
+<<<<<<< HEAD
   machine_rpi:
+=======
+  machine:
+>>>>>>> 6157f68666d57632f83a685ab5521145d6c923fc
     build:
       context: .
       dockerfile: docker/machine/rpi.Dockerfile
@@ -37,7 +45,11 @@ services:
       - lab
       - dbmongo
 
+<<<<<<< HEAD
   dbmongo_rpi:
+=======
+  dbmongo:
+>>>>>>> 6157f68666d57632f83a685ab5521145d6c923fc
     build:
       context: .
       dockerfile: docker/dbmongo/rpi.Dockerfile

diff --git a/docker/lab/rpi.Dockerfile b/docker/lab/rpi.Dockerfile
@@ -11,7 +11,11 @@ FROM ubuntu:bionic
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
+<<<<<<< HEAD
 ENV NODE_VERSION 12.22.9
+=======
+ENV NODE_VERSION 12.20.0
+>>>>>>> 6157f68666d57632f83a685ab5521145d6c923fc
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && case "${dpkgArch##*-}" in \
@@ -40,8 +44,11 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
       108F52B48DB57BB0CC439B2997B01419BD92F80A \
       B9E2F5981AA6E0CD28160D9FF13993A75599653C \
     ; do \
+<<<<<<< HEAD
       gpg --batch --keyserver hkp://keyring.debian.org:80 --recv-keys "$key" || \
       gpg --batch --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys "$key" || \
+=======
+>>>>>>> 6157f68666d57632f83a685ab5521145d6c923fc
       gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
       gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
       gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
@@ -75,8 +82,11 @@ RUN set -ex \
   && for key in \
     6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
+<<<<<<< HEAD
     gpg --batch --keyserver hkp://keyring.debian.org:80 --recv-keys "$key" || \
     gpg --batch --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys "$key" || \
+=======
+>>>>>>> 6157f68666d57632f83a685ab5521145d6c923fc
     gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
     gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
     gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \

diff --git a/docker/machine/rpi.Dockerfile b/docker/machine/rpi.Dockerfile
@@ -1,6 +1,10 @@
 FROM python:3.7-buster
 
+<<<<<<< HEAD
 ENV NODE_VERSION 12.22.9
+=======
+ENV NODE_VERSION 12.20.0
+>>>>>>> 6157f68666d57632f83a685ab5521145d6c923fc
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && case "${dpkgArch##*-}" in \
@@ -29,8 +33,11 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
       108F52B48DB57BB0CC439B2997B01419BD92F80A \
       B9E2F5981AA6E0CD28160D9FF13993A75599653C \
     ; do \
+<<<<<<< HEAD
       gpg --batch --keyserver hkp://keyring.debian.org:80 --recv-keys "$key" || \
       gpg --batch --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys "$key" || \
+=======
+>>>>>>> 6157f68666d57632f83a685ab5521145d6c923fc
       gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
       gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
       gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \